Add ControllerTest