Small refactoring fixes [KFSQA-1029]