added test config and refactored logback
Merge remote-tracking branch 'origin/master'