Reorganize and rework the whole test suite.