add router test
clean tests
router
Merge pull request #37 from stevelacy/master

organize test naming