[Issue #205][WIP] Fixed scenario reviewers comments