Fixed tests, working on routes

Found a pretty nasty bug in the new router.