Fixing review issues [KFSQA-653]