Fixed broken gentests.
Merge branch 'gentests-fix' of https://github.com/cheeseng/scalatest