Add tests for controller