Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java	(revision 32297)
@@ -66,6 +66,4 @@
 		if (rm.getType().equals(OsmPrimitiveType.RELATION)) {
 			if (rm.getRole().equals("stop_area")) {
-				return true;
-			} else if (rm.getRole().equals("platform") || rm.getRole().equals("platform_entry_only") || rm.getRole().equals("platform_exit_only")){
 				return true;
 			} else {
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopToWayAssigner.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopToWayAssigner.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/StopToWayAssigner.java	(revision 32297)
@@ -11,12 +11,4 @@
 import org.openstreetmap.josm.data.osm.Way;
 
-/**
- * Assigns stops to ways in following steps: (1) checks if the stop is in the
- * list of already assigned stops, (2) checks if the stop has a stop position,
- * (3) calculates it using proximity / growing bounding boxes
- * 
- * @author darya
- *
- */
 public final class StopToWayAssigner {
 
@@ -31,11 +23,14 @@
 			return stopToWay.get(stop.getId());
 		}
+		
 
+		
+		
 		if (stop.getType().equals(OsmPrimitiveType.NODE)) {
 			List<OsmPrimitive> referrers = stop.getReferrers();
 			List<Way> referredWays = new ArrayList<>();
-			for (OsmPrimitive referrer : referrers) {
+			for (OsmPrimitive referrer: referrers) {
 				if (referrer.getType().equals(OsmPrimitiveType.WAY)) {
-					referredWays.add((Way) referrer);
+					referredWays.add((Way)referrer);
 				}
 			}
@@ -50,8 +45,7 @@
 		return null;
 	}
-
+	
 	/**
 	 * Remove a map entry
-	 * 
 	 * @param stopId
 	 */
Index: plications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java	(revision 32296)
+++ 	(revision )
@@ -1,46 +1,0 @@
-package org.openstreetmap.josm.plugins.pt_assistant.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.validation.Test;
-import org.openstreetmap.josm.data.validation.TestError;
-
-
-/**
- * Represents tests and fixed of the PT_Assistant plugin 
- * 
- * @author darya
- *
- */
-public abstract class Checker {
-	
-	// test which created this WayChecker:
-	protected final Test test;
-
-	// relation that is checked:
-	protected Relation relation;
-
-	// stores all found errors:
-	protected ArrayList<TestError> errors = new ArrayList<>();
-	
-	protected Checker(Relation relation, Test test) {
-		
-		this.relation = relation;
-		this.test = test;
-
-	}
-	
-	/**
-	 * Returns errors
-	 */
-	public List<TestError> getErrors() {
-
-		return errors;
-	}
-	
-	
-	
-
-}
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java	(revision 32297)
@@ -19,20 +19,24 @@
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 
-/**
- * Performs tests of a route at the level of the whole route: sorting test
- * 
- * @author darya
- *
- */
-public class RouteChecker extends Checker {
+public class RouteChecker {
 
+	// test which created this WayChecker:
+	private final Test test;
+
+	// relation that is checked:
+	private Relation relation;
+
+	// stores all found errors (on way level):
+	private ArrayList<TestError> errors = new ArrayList<>();
+	
 	private boolean hasGap;
 
 	List<RelationMember> sortedMembers;
 
-	public RouteChecker(Relation relation, Test test) {
+	public RouteChecker(Relation r, Test t) {
 
-		super(relation, test);
-
+		this.test = t;
+		this.relation = r;
+		
 		this.hasGap = false;
 
@@ -56,7 +60,7 @@
 
 		if (hasGap(waysToCheck)) {
-
+			
 			this.hasGap = true;
-
+			
 			RelationSorter sorter = new RelationSorter();
 			sortedMembers = sorter.sortMembers(waysToCheck);
@@ -99,4 +103,12 @@
 	}
 
+	/**
+	 * Returns errors
+	 */
+	public List<TestError> getErrors() {
+
+		return errors;
+	}
+
 	public List<RelationMember> getSortedMembers() {
 
@@ -104,9 +116,9 @@
 
 	}
-
+	
 	public boolean getHasGap() {
-
+		
 		return this.hasGap;
-
+		
 	}
 
Index: plications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java	(revision 32296)
+++ 	(revision )
@@ -1,57 +1,0 @@
-package org.openstreetmap.josm.plugins.pt_assistant.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.validation.Test;
-import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteDataManager;
-import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteSegment;
-import org.openstreetmap.josm.plugins.pt_assistant.data.PTStop;
-import org.openstreetmap.josm.plugins.pt_assistant.data.PTWay;
-import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
-
-/**
- * Performs tests of a route at the level of route segments (the stop-by-stop
- * approach).
- * 
- * @author darya
- *
- */
-public class SegmentChecker extends Checker {
-
-	/*
-	 * PTRouteSegments that have been validated and are correct. They need to
-	 * accessible
-	 */
-	private static List<PTRouteSegment> correctSegments = new ArrayList<PTRouteSegment>();
-
-	private PTRouteDataManager manager;
-
-	public SegmentChecker(Relation relation, Test test) {
-
-		super(relation, test);
-		
-		this.manager = new PTRouteDataManager(relation);
-
-	}
-
-	private void performEndstopTest() {
-		
-		if (manager.getPTStopCount() < 2) {
-			// it does not make sense to check a route that has less than 2 stops
-			return;
-		}
-		
-		PTStop firstStop = manager.getFirstStop();
-		PTStop lastStop = manager.getLastStop();
-		
-		// TODO: we need the stops to be assigned to routes.
-	}
-
-	private void performSegmentTest() {
-		// TODO
-	}
-
-}
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java	(revision 32297)
@@ -19,14 +19,27 @@
 
 /**
- * Performs tests of a route at the level of single ways: DirectionTest and RoadTypeTest
+ * Performs the DirectionTest and RoadTypeTest at the level of single ways
  * 
  * @author darya
  *
  */
-public class WayChecker extends Checker {
+public class WayChecker {
 
-	public WayChecker(Relation relation, Test test) {
+	// test which created this WayChecker:
+	private final Test test;
 
-		super(relation, test);
+	// relation that is checked:
+	private Relation relation;
+
+	// stores all found errors (on way level):
+	private ArrayList<TestError> errors = new ArrayList<>();
+
+	// stores all ways that were found wrong and need to be removed:
+	private ArrayList<Way> wrongWays = new ArrayList<>();
+
+	public WayChecker(Relation r, Test test) {
+
+		this.test = test;
+		this.relation = r;
 
 		this.performDirectionTest();
@@ -147,4 +160,9 @@
 	}
 
+	public List<TestError> getErrors() {
+
+		return errors;
+	}
+
 	/**
 	 * Checks if the type of the way is suitable for buses to go on it. The
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java	(revision 32297)
@@ -1,3 +1,3 @@
-package unit.org.openstreetmap.josm.plugins.pt_assistant;
+package org.openstreetmap.josm.plugins.pt_assistant;
 
 import org.junit.BeforeClass;
@@ -36,7 +36,4 @@
  public static final String PATH_TO_PLATFORM_AS_WAY = "test/data/route-with-platform-as-way.osm";
  
- public static final String PATH_TO_ROUNDABOUT_ONEWAY = "test/data/duesseldorf_roundabout.osm";
- 
- public static final String PATH_TO_ROAD_TYPE_ERROR = "test/data/road-type.osm";
  
  
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/ImportUtils.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/ImportUtils.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/ImportUtils.java	(revision 32297)
@@ -1,3 +1,3 @@
-package unit.org.openstreetmap.josm.plugins.pt_assistant;
+package org.openstreetmap.josm.plugins.pt_assistant;
 
 /**
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/TestUtil.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/TestUtil.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/TestUtil.java	(revision 32297)
@@ -1,3 +1,3 @@
-package unit.org.openstreetmap.josm.plugins.pt_assistant;
+package org.openstreetmap.josm.plugins.pt_assistant;
 
 import static org.junit.Assert.assertEquals;
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTestTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTestTest.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/GapTestTest.java	(revision 32297)
@@ -1,3 +1,3 @@
-package unit.org.openstreetmap.josm.plugins.pt_assistant.validation;
+package org.openstreetmap.josm.plugins.pt_assistant.validation;
 
 import static org.junit.Assert.assertEquals;
@@ -12,6 +12,6 @@
 import org.openstreetmap.josm.plugins.pt_assistant.validation.GapTest;
 
-import unit.org.openstreetmap.josm.plugins.pt_assistant.AbstractTest;
-import unit.org.openstreetmap.josm.plugins.pt_assistant.ImportUtils;
+import org.openstreetmap.josm.plugins.pt_assistant.AbstractTest;
+import org.openstreetmap.josm.plugins.pt_assistant.ImportUtils;
 
 public class GapTestTest extends AbstractTest {
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformAsWayTest.java	(revision 32297)
@@ -1,3 +1,3 @@
-package unit.org.openstreetmap.josm.plugins.pt_assistant.validation;
+package org.openstreetmap.josm.plugins.pt_assistant.validation;
 
 import static org.junit.Assert.assertEquals;
@@ -12,6 +12,6 @@
 import org.openstreetmap.josm.plugins.pt_assistant.validation.GapTest;
 
-import unit.org.openstreetmap.josm.plugins.pt_assistant.AbstractTest;
-import unit.org.openstreetmap.josm.plugins.pt_assistant.ImportUtils;
+import org.openstreetmap.josm.plugins.pt_assistant.AbstractTest;
+import org.openstreetmap.josm.plugins.pt_assistant.ImportUtils;
 
 public class PlatformAsWayTest extends AbstractTest{
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformsFirstTestTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformsFirstTestTest.java	(revision 32296)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/PlatformsFirstTestTest.java	(revision 32297)
@@ -1,3 +1,3 @@
-package unit.org.openstreetmap.josm.plugins.pt_assistant.validation;
+package org.openstreetmap.josm.plugins.pt_assistant.validation;
 
 import static org.junit.Assert.assertEquals;
@@ -12,6 +12,6 @@
 import org.openstreetmap.josm.plugins.pt_assistant.validation.PlatformsFirstTest;
 
-import unit.org.openstreetmap.josm.plugins.pt_assistant.AbstractTest;
-import unit.org.openstreetmap.josm.plugins.pt_assistant.ImportUtils;
+import org.openstreetmap.josm.plugins.pt_assistant.AbstractTest;
+import org.openstreetmap.josm.plugins.pt_assistant.ImportUtils;
 
 public class PlatformsFirstTestTest extends AbstractTest {
Index: plications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java	(revision 32296)
+++ 	(revision )
@@ -1,45 +1,0 @@
-package unit.org.openstreetmap.josm.plugins.pt_assistant.validation;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.List;
-
-import org.junit.Test;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.plugins.pt_assistant.validation.RoadTypeTest;
-
-import unit.org.openstreetmap.josm.plugins.pt_assistant.AbstractTest;
-import unit.org.openstreetmap.josm.plugins.pt_assistant.ImportUtils;
-
-public class RoadTypeTestTest extends AbstractTest {
-	
-	@Test
-	public void test() {
-		
-		File file = new File(AbstractTest.PATH_TO_ROAD_TYPE_ERROR);
-		DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
-		
-		RoadTypeTest roadTypeTest = new RoadTypeTest();
-		for (Relation r: ds.getRelations()) {
-			roadTypeTest.visit(r);
-		}
-		
-		List<TestError> errors = roadTypeTest.getErrors();
-		assertEquals(errors.size(), 2);
-		
-		for (TestError e: errors) {
-			assertEquals(e.getCode(), RoadTypeTest.ERROR_CODE_ROAD_TYPE);
-			List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
-			Way way = (Way) highlighted.get(0);
-			assertTrue(way.getId() == 8169083 || way.getId() == 8034569);
-		}
-	}
-
-
-}