Adds a few more tests for dealing with conflicts.

Cleans up some compiler warnings in CDTDatastore+Conflicts due to
unused variables.