Adds noConflict tests.
Merge pull request #70 from jmeas/test-no-conflict

Adds noConflict tests.