Fixed test failures introduced in e16c48e001.