MULE-8030: fixing broken tests