Add more ControllerActivity tests