Fix Derby and H2 tests.