Updated Mockito tests for service layer