Merge 2.066 testsuite