[KFSQA-839] More fixes.
[KFSQA-839] Revised some steps.