Added more tests for controller.