Fix tests, new clTRID interface