Reverting back to use TestWaiter instead of WebDriverWait. But with the correct expected exception.