fixing tests [KFSQA-582]
Merge remote-tracking branch 'origin/master'