Updates to H2 tests.