Correct Tests locators
Fix No Element issues