Fixed up tests with some more assertions in the wildcard class