KFSQA-864 clean up and test finally working, just need validation