[KFSQA-731] Working my way through KFSQA-853 fixing junk.