fix a test bug
Merge branch 'master' into journal