Enhanced db testing stuff to support H2 in addition to HSQL