Making the waitFor test be leading instead of trailing