Update to include latest Test::Builder alpha

Also updated some tests that the new builder broke