Renamed controller in routing test
Merge branch 'bug/routing-test'