nosetests refixed with dirk's updated patch.