Add hydrator & model tests