The mixed_merge tests could use some comments to clear up what we're actually testing here.