These changes prepare for the changes to the tests that are coming, but
make no change to the behavior themselves.