KAFKA-1725: New test files, patch part 2