- Add a test to cover this and tweak the test to not use two merge
  paths to be sure things are as expected.