Added some tests on the controller
Added 16 tests on the controllers