Refactor test fixtures

- modularize journal support