Track moving and merging separately

Had to clean up a few tests that assumed the concepts were the same.

Also added assertions for the MovedFrom property which was not previous
covered.