merge branches

Fix tour tests