OSNG-80 - corrected tests
Merge remote-tracking branch 'origin/master'