Fixed test failures introduced in previous commit.