Reworked router-test to fix issue #4