Index: trunk/test/atmsdriver/model/LoadHighwaysTest.java
===================================================================
--- trunk/test/atmsdriver/model/LoadHighwaysTest.java	(revision 212)
+++ trunk/test/atmsdriver/model/LoadHighwaysTest.java	(revision 343)
@@ -29,38 +29,20 @@
             writer.println("2");
             writer.println("32 0 2");
-            writer.println("1210831 1 5 S 0.9 8 CALAFIA");
-            writer.println("1210832 ML_1");
-            writer.println("1210833 ML_2");
-            writer.println("1210834 ML_3");
-            writer.println("1210835 ML_4");
-            writer.println("1210836 PASSAGE");
-            writer.println("1210837 DEMAND");
-            writer.println("1210838 QUEUE");
-            writer.println("1210839 RAMP_OFF");
-            writer.println("1210845 2 5 S 1.49 9 EL CAMINO REAL");
-            writer.println("1210846 ML_1");
-            writer.println("1210847 ML_2");
-            writer.println("1210848 ML_3");
-            writer.println("1210849 ML_4");
-            writer.println("1210850 RAMP_ON");
-            writer.println("1210851 PASSAGE");
-            writer.println("1210853 DEMAND");
-            writer.println("1210854 QUEUE");
-            writer.println("1210855 RAMP_OFF");
+            writer.println("1210831 1 5 S 0.9 4 CALAFIA");
+            writer.println("1210832 ML ML_1");
+            writer.println("1210833 ML ML_2");
+            writer.println("1210834 ML ML_3");
+            writer.println("1210835 ML ML_4");
+            writer.println("1210845 2 5 S 1.49 4 EL CAMINO REAL");
+            writer.println("1210846 ML ML_1");
+            writer.println("1210847 ML ML_2");
+            writer.println("1210848 ML ML_3");
+            writer.println("1210849 ML ML_4");
             writer.println("74 0 1");
-            writer.println("1204203 2 5 N 1.26 13 MAGDALENA");
-            writer.println("1204205 RAMP_ON");
-            writer.println("1204206 QUEUE");
-            writer.println("1204207 DEMAND");
-            writer.println("1204208 PASSAGE");
-            writer.println("1204210 RAMP_OFF");
-            writer.println("1204212 ML_1");
-            writer.println("1204213 ML_2");
-            writer.println("1204214 ML_3");
-            writer.println("1204215 ML_4");
-            writer.println("1204217 OS_1");
-            writer.println("1204218 OS_2");
-            writer.println("1204219 OS_3");
-            writer.println("1204220 OS_4");
+            writer.println("1204203 2 5 N 1.26 4 MAGDALENA");
+            writer.println("1204212 ML ML_1");
+            writer.println("1204213 ML ML_2");
+            writer.println("1204214 ML ML_3");
+            writer.println("1204215 ML ML_4");
             writer.close();
         } catch (Exception e) {
@@ -77,5 +59,5 @@
 
     /**
-     * Test of toXML method, of class Network.
+     * Test of Highways constructor 
      */
     public void testLoadHighways() {
@@ -117,5 +99,5 @@
         
         // Test for correct number of loops
-        assertEquals(new Integer(30), new Integer(fiveS.stations.get(0).loops.size()
+        assertEquals(new Integer(12), new Integer(fiveS.stations.get(0).loops.size()
             + fiveS.stations.get(1).loops.size() + fiveS.stations.get(2).loops.size()));
     }