KFSQA-631 pushing changes to do code reivews

have almost all tests running just need PE and TF