Make zookeeper port configurable
Fix tests