Added some more tests for controllers