Fix some style warnings in tests
Fix regression due to 7cdfa1f6

Having changed to EXPLICIT-CHECK, the generic branch needs to perform
a type-check; and I missed that it formerly discarded multiple values.