Allow extra test suite to run with HP ndmitchell/extra#2