PatientServiceTest refactored