TRUNK-3772: SHould be able to define EncounterVisitHandlers as spring beans - fix tests