KFSQA-613 ready for review

DV will be moved to another test. Will need to refactor at some point.