Refactor for new hydration stack
Refactor tests