Patching up tests: 9 down, 1 to go

`WildcardType`