Fixed test and build errors.