Merge pull request #2177 from NuGet/danliu/testcleanup

Danliu/testcleanup