Added some unit tests for the controller