Add new test case
Remove XSD-based approach to routing