Fixed test failures introduced in a5becad9094e5c5403b692b9a7b3a6ffaabf64a3.