* Fix for upgrade with missing journal * add test, refactor solution * add missing test config Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>