US573 - fix test issues
Merge branch 'development-fix' into development