More string equality fixes
Merge with Zane's tests