Refactoring controllers to use TestableControllerTrait