Testsuite: tidying