fix locators for non-xfailed tests

A few quick locator tweaks. Additional prs coming for the pom fixes for the `xfailed` tests that are failing due to incorrect locators.