Added tests for Controller