Index: trunk/test/atmsdriver/model/StationTest.java
===================================================================
--- trunk/test/atmsdriver/model/StationTest.java	(revision 91)
+++ trunk/test/atmsdriver/model/StationTest.java	(revision 103)
@@ -33,5 +33,5 @@
     public void testGetHighwayNumber() {
         System.out.println("getHighwayNumber");
-        assertEquals(4, alpha.getHighwayNumber());
+        assertEquals(4, alpha.routeNumber);
     }
 
@@ -41,5 +41,5 @@
     public void testGetDirection() {
         System.out.println("getDirection");
-        assertEquals(DIRECTION.NORTH, alpha.getDirection());
+        assertEquals(DIRECTION.NORTH, alpha.direction);
     }
 
@@ -59,5 +59,5 @@
     public void testGetPostmile() {
         System.out.println("getPostmile");
-        assertEquals(1.0, alpha.getPostmile(),0.1);
+        assertEquals(1.0, alpha.postmile,0.1);
     }
 
Index: trunk/test/atmsdriver/model/LoadHighwaysTest.java
===================================================================
--- trunk/test/atmsdriver/model/LoadHighwaysTest.java	(revision 96)
+++ trunk/test/atmsdriver/model/LoadHighwaysTest.java	(revision 103)
@@ -1,7 +1,4 @@
 package atmsdriver.model;
 
-import atmsdriver.ATMSDriver;
-import atmsdriver.model.Station.DIRECTION;
-import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
@@ -70,10 +67,10 @@
         
         // Test for correct number of highways
-        ArrayList<Highway> result = highways.getHighways();
-        assertEquals(3, result.size());
+        ArrayList<Highway> result = highways.highways;
+        assertEquals(2, result.size());
         
         // Test 55 N was loaded
-        Highway fiftyfiveN = result.get(2);
-        assertEquals(new Integer(55), fiftyfiveN.highwayNumber);
+        Highway fiftyfiveN = result.get(0);
+        assertEquals(new Integer(55), fiftyfiveN.routeNumber);
         
         // Test 55 N stations are sorted by postmile
@@ -82,12 +79,18 @@
         for(Station station : stations)
         {
-            stationsPostmiles.add(station.getPostmile());
+            stationsPostmiles.add(station.postmile);
         }
+        
+        // Create expected station postmile list (sorted)
         ArrayList<Double> expectedStationsPostmiles = new ArrayList<>();
         expectedStationsPostmiles.add(new Double(4.58));
+        expectedStationsPostmiles.add(new Double(4.7));
+        expectedStationsPostmiles.add(new Double(5.06));
         expectedStationsPostmiles.add(new Double(5.51));
         expectedStationsPostmiles.add(new Double(9.41));
         expectedStationsPostmiles.add(new Double(10));
-        for(int i = 0; i < 4; i++)
+        expectedStationsPostmiles.add(new Double(10.4));
+        expectedStationsPostmiles.add(new Double(10.5));
+        for(int i = 0; i < 8; i++)
         {
             assertEquals(expectedStationsPostmiles.get(i), 
@@ -96,6 +99,6 @@
         
         // Test 55 S was loaded
-        Highway fiftyfiveS = result.get(0);
-        assertEquals(new Integer(55), fiftyfiveS.highwayNumber);
+        Highway fiftyfiveS = result.get(1);
+        assertEquals(new Integer(5), fiftyfiveS.routeNumber);
         
         // Test 55 S stations are sorted by postmile
@@ -104,26 +107,5 @@
         for(Station station : stations)
         {
-            stationsPostmiles.add(station.getPostmile());
-        }
-        expectedStationsPostmiles.clear();
-        expectedStationsPostmiles.add(new Double(4.7));
-        expectedStationsPostmiles.add(new Double(5.06));
-        expectedStationsPostmiles.add(new Double(10.4));
-        expectedStationsPostmiles.add(new Double(10.5));
-        for(int i = 0; i < 4; i++)
-        {
-            assertEquals(expectedStationsPostmiles.get(i), 
-                    stationsPostmiles.get(i));
-        }
-        
-        Highway fiveS = result.get(1);
-        assertEquals(new Integer(5), fiveS.highwayNumber);
-        
-        // Test 5 S stations are sorted by postmile
-        stations = fiveS.stations;
-        stationsPostmiles.clear();
-        for(Station station : stations)
-        {
-            stationsPostmiles.add(station.getPostmile());
+            stationsPostmiles.add(station.postmile);
         }
         expectedStationsPostmiles.clear();
@@ -131,5 +113,5 @@
         expectedStationsPostmiles.add(new Double(32.25));
         expectedStationsPostmiles.add(new Double(33));
-        for(int i = 0; i < 2; i++)
+        for(int i = 0; i < 3; i++)
         {
             assertEquals(expectedStationsPostmiles.get(i),