Update tests to match changes introduced in c90ac22.