I agree, too.  However, the changes are more extensive than just fixing bugs in the tests.  The structure and how they are run is different, too.  Would you or Marc please take a look and send me a patch?