Fixed tests to support Java 6 only syntax, and deleted EntryRouteUnit.