fixes after running all tests. Make the tests more reliable.
Merge pull request #2185 from NuGet/danliu/testcleanup

fixes after running all tests. Make the tests more reliable.