Tedious tidying in the testsuite