Fix failing tests with changed locators and unxfail tests that are xpass...

...ed