* tour refactor

@wesleykendall tours have been refactored and tests were rewritten