Update more mappings to CompletenessTest