Kafka test fixes