Adjusted to avoid potential match errors.
Merge branch 'match-error-2' of https://github.com/cheeseng/scalatest