Fixed the test

The node existed in the dumb singleton, and so an artificial conflict was
created
Added test to check for conflicting updates