Avoid using hydraters in tests