Fixed test failures.