Initial work in adding tests for Router