1st refactoring for h2 test