Updated controller tests
Added service tests
Updated tests

Updated controller tests
Added service tests