diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/worker/testworker.py b/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/tools/test-worker.py
similarity index 62%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/worker/testworker.py
rename to scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/tools/test-worker.py
index eee998910..d0c143006 100755
--- a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/worker/testworker.py
+++ b/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/tools/test-worker.py
@@ -1,9 +1,10 @@
 #!/usr/bin/python2.5
 
+import sys
+import pprint
+
 from twisted.spread import pb
 from twisted.internet import reactor
-from twisted.python import util
-import sys
 
 factory = pb.PBClientFactory()
 reactor.connectTCP("localhost", 8789, factory)
@@ -11,15 +12,13 @@ d = factory.getRootObject()
 
 sys.argv.pop(0)
 
-if not sys.argv:
+if not sys.argv or sys.argv[0] == '--status':
     d.addCallback(lambda object: object.callRemote("status"))
-elif sys.argv[0] == "-s":
+elif sys.argv[0] == "--stop":
     d.addCallback(lambda object: object.callRemote("stop", sys.argv[1]))
-elif sys.argv[0] == "-r":
+elif sys.argv[0] == "--run":
     d.addCallback(lambda object: object.callRemote("run", sys.argv[1]))
-elif sys.argv[0] == "-t":
-    d.addCallback(lambda object: object.callRemote("statistics"))
 
-d.addCallbacks(callback = util.println, errback = lambda reason: 'error: '+str(reason.value))
+d.addCallbacks(callback=pprint.pprint, errback=lambda reason:'error: ' + str(reason.value))
 d.addCallback(lambda _: reactor.stop())
 reactor.run()