Bugfix in tsp_test (#476)
Merge remote-tracking branch: upstream/master