Improve h2 tests