Updated tests to match locators in 4.1 branch
Merge pull request #976 from aliceh/upstream-merge

Updated tests to match locators in 4.1 branch