Merge pull request #2174 from NuGet/danliu/testfix

Danliu/testfix