Fix failing tests in EncounterServiceTest - TRUNK-4545