New GenericModulatingProduction model + improved test setup