moved router unit tests in to folders; better organization
some more unit tests around query handling