ZooKeeperStreamDefinitionRepositoryTests pass; minor cleanup