Big improvements to h2 test harness!