Removed a redundant line.
Added tests for the CDEPersistentStoreEnsemble delegate methods that are invoked during merging. Not finished yet.
Finished the failed save unit tests in merge.