Added unit tests for Jira #721