[KFSQA-988] Test does not yet fully function. Committing for peer input.
[KFSQA-988] Coding complete for successful test.
Merge remote-tracking branch 'origin/master' into KFSQA-988
Merge branch 'master' into KFSQA-988
[KFSQA-997] merge from master