Bug 949537 - Some cleanup of the substring matching tests. r=gwagner