TRUNK-4545: Fix failing tests in EncounterServiceTest