Update test tour to use the new non-linear tour API

Change-Id: I20ce0338ad693ff85933757424faaf92e7c34daf