further improve unit tests
Merge branch 'master' into journal