Fixed test failures from 09f865276554f35060ff939722ec4cefd578edf6.