Fix things for the new Test::Builder stuff (Test-More - master)