Cleaned up PatientServiceTest