Added JournalSystem to handle multiple journals in one place
Fixed unittests according to changed external api