Revert to good build
Use wait_for() in URL checks