MT#7005 adapt tests for new CFU call-flow.