Fixed test issues.