Added tests for the new controllers