Adding unit tests related to the Jira DS-22