Fixes for string matching.
More string matching tests.