Move stuff around
FileJournal tests
InMemoryDataStore tests