[KFSQA-765] made changes based on review comments