added tests and more routed responses