Added extra verifications, changed locators in places of recent failures in tests