Fix issues from code review (https://github.com/esl/escalus/pull/30/files)