[KFSQA-919]  made changes based on review comments