Fix some test compile errors.