Fix bad merge in string test.