Change to PatientTests to represent changes in class, Caretaker tests also added