[MERGE] Convert tests.blackbox.test_merge to use internals where appropriate

[Aaron Bentley]

Aaron Bentley has voted approve.
Status is now: Semi-approved


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C1187891760.6066.7.camel%40lapbert%3E