This doesn't make much sense anymore, since the APIs changed in Search 6: tests targeting the old APIs will have to be converted anyway, and this will be about more than just adding a generic type argument.
Closing, we'll do that as we convert tests.