Tweak language for routes
Fix tests mock controller helper