Fix few resource producer broken tests