Fix up the test build process.