Issue #26712: Merge string_tests cleanup from 3.5