[MERGE] cleanup blackbox tests

[Vincent Ladeuil]

>>>>> "john" == John Arbash Meinel <john at arbash-meinel.com> writes:

    john> John Arbash Meinel has voted +1.
    john> Status is now: Approved
    john> Comment:
    john> I didn't review all of the changes, assuming that the test_*
    john> changes were mostly mechanical.

They weren't, I reviewed the patch and was interested, so I
dug and already have two other patches on top of this one that
I'd like Martin to have a look at, don't merge too quickly.

Many files are already concerned, as it's cleaning, let's do it once.

     Vincent