Added tests for relevant controllers