[KFSQA-1012] Changes to implement this test.
[KFSQA-1012] Fix for KFSQA-970 needed after KFSQA-1012 changes made.