Merge pull request #2112 from NuGet/danliu/testfix

Danliu/testfix