Fixed test failures due to previous commit.