Refactor tests
Add test for routing based on method