Fix bad merge in string test.
Merge pull request #84 from cgruber/fixtest

Fix bad merge in string test.