Updated tests to match locators in 4.1 branch, added assertions
Merge pull request #975 from aliceh/upstream-merge

Updated tests to match locators in 4.1 branch, added assertions