Updated the hydrator to make it conform to the test