Fixing test
Merge branch 'master' into rc-fixes
Merge branch 'master' of https://github.com/bb-qa/bb-regression-testing