More work for interfacing to the new test suite.