use hsql for tests
Merge origin/master