jiraId:mar-456 unit tests