more tests and fixes for circular routes
more order bugfixes