Changes made to findControl methods to use ExpectedConditions