Added some more unit test to the controller section