KFSQA-589 cleaned up test to use data object more