Some more initial work on the new test suite.

Work in progress.