Refactoried ControllerActivityTest