comment tidying in main testsuite