Updated most code to use WebDriverWait