Fix some bitrot.

Massage the types in the test code so that the code compiles and runs.