Added new unit test and made test of controller integration test