CLA-677 More tests for ZooKeeper