branches: 1.31.2; 1.31.10;
re-do the tests so that it's much easier to see at a glance which tests
passed and which failed.