Add hydrator tests