Integrated the new test runner. test.py is just a script that imports

and uses zope.testing.testrunner as a module.

lib/python/Zope2/Startup/zopectl.py

@@ -244,7 +244,7 @@ class ZopeCmd(ZDCmd):
         # (rather than $INSTANCE_HOME/lib/python)
         if '--libdir' not in args:
             args.insert(0, 'Products')
-            args.insert(0, '--libdir')
+            args.insert(0, '--package')
 
         # Supply our config file by default.
         if '--config-file' not in args and '-C' not in args: