Refactor WaitUntil to use DefaultWait