Merge branch 'testsuite-refactor' into maint