Fix up build of tests.