Fixing logging while in test mode
Commenting out failing unit test
Merge remote-tracking branch 'origin' into dev/FEND-901