=per #3797 Fix failing persistence tests

- make sure that journal is created *after* initial cleanup of journal files
- revert afterTermination to previous implementation