Fix setTourCookie test:

* endTour is not correct here and now causes a problem.
* Instead, just save and restore the cookie value.

Change-Id: Ia1565dcce679f038060e12292a0c38c3c955c80c