Lots of clean up for test coverage and the service tests -- removed need for Mockery