Fixed test failures from 98e8da3709e400d549e87c7ff1450a2685c0adcf.