Merge branch 'fix-gengen-tests' of https://github.com/cheeseng/scalatest into feature-should-not-typecheck-dotty

Author: cheeseng