More producer tests

I've fixed and added some producer tests in order to increase coverage. Please review.