[KFSQA-755] Changes based on review comments