Added preliminary ZooKeeper support, refactored to support phased tests.