Baldur/fixing tests for stricter router

this incorporates this https://github.com/mapzen/android/pull/106