[KFSQA-838] Getting closer...