Cleaned up routing
Updated tests
Merge branch 'routing'