Hydrator strategies improvments and tests