h2 db for test, minor fixes