Make model:producer tests pass