Fix indexOf related tests.
Merge