Fixing logging while in test mode
Commenting out failing unit test
Merge branch 'master' into dev/FEND-809