Fixed bug with patientCalendar. Repaired unit tests.