TUSCANY-3778 - changes to demonstrate the issues described in the JIRA. The failing tests are commented out.