journal and test fixes