Replaced custom Wait with WebDriver's standard one