adding tests, working on the router class