Reorganised test suite.