Fixed new integration tests that weren't working correctly
Fixed issue with route combination that became apparant after fixing tests