[KFSQA-649] I think I have these tests working, I am just going through and double-checking things.