journal cleanup + more test coverage. Added @mockify support to test_helper