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

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

!approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGshbwzYr338mxwCURAvaiAJ455t+EW5iNIb+173jZlvYdWWmSHgCfbSr1
RzpMImGP1MOZQqCdXQx0YF4=
=7ykw
-----END PGP SIGNATURE-----