Merge "Reorganize testsuites"