Hydrator strategy improvment and tests