updating functional tests, changing clicks and waitFor