Fix functional tests after CIP controller changes.