Merge "FileJournal tests"