Fix compilation of tests.

I probably didn't test at all. Too many things at once.