More testsuite deduplication.
Finish testsuite deduplication.