Add named producer to test cases and code to handle