Rename custom matchers file.
Fix tour spec.