Added more tests for Controller.