[KFSQA-731] Working through revisions to KFSQA-853 to bring it up to standards.