Add more hydration2 tests, circular deps work