Add class headers, add smaller timeout to waitForObject
Added class header
Refactor the patient table