TRUNK-4325 Randomly failing tests in ShortPatientFormControllerTest