updated tests to match new routing (although integration test is still broken)