Update GenericCaseTest.scala
Merge remote-tracking branch 'upstream/2.1-maint'