Follow up: Add conflicts true parameter to tests
Merge pull request #362 from daleharvey/fix-tests

Follow up: Add conflicts true parameter to tests