merge of #2829 remove unneeded files from test/common