Added a test for JIRA tickets TROIA-289 and TROIA-290