Add tests for controller
Remove custom RouteMatch