[Finishes 67045518, 67046450]: Fix text string, add success case