fixed scenarios
jiraId:MAR-457 refactor