Clean up producer test a bit