Improved producers and added headder logging to test.