fixes based on review (testing helps!) [KFSQA-1066]