Add string test.
Fix merge conflict.