SaveEncounterORU_R01ValidatorAndEnricher: refactoring, added new tests, improved existing tests