Added log4j test
Change order of log messages
Merge branch 'unit-tests'