US543 Tweaking code for unit tests.
Merge remote-tracking branch 'origin/development' into development