Merge pull request #2098 from NuGet/danliu/testfix

Danliu/testfix