HEMERA-3657 fix broken tests