Add a test to verify CM implementation of conflict resolution; try to refactor tests too