This was part of figuring out why the merging was making the tests fail.  I probably don't need it anymore since we are skipping that test now anyway.