Cluster builder uses zk and Kafka fixtures.
Adds slight changes to tests.