Updated tests to match locators in 4.1 branch, added assertions