Add tests for noConflict
Compact noConflict