Fixup cherrypick of test case
Fixup cherrypick of test case

martijnhoekstra/scala,martijnhoekstra/scala,martijnhoekstra/scala,martijnhoekstra/scala,lrytz/scala,scala/scala,lrytz/scala,lrytz/scala,scala/scala,scala/scala,lrytz/scala,martijnhoekstra/scala,martijnhoekstra/scala,lrytz/scala,scala/scala,lrytz/scala,scala/scala,scala/scala