Journal - tests - combine leaf optimization and follow
Journal - more strict constructor args checking + removed
unneeded args in different places