[MERGE] Convert tests.blackbox.test_[pull|nick] 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/%3C1187705800.6453.12.camel%40lapbert%3E