Quite a few additions to HandTest.