fix some types and tests
Merge branch 'master' of https://github.com/NuGet/NuGet.Services.Metadata
Merge branch 'master' of https://github.com/NuGet/NuGet.Services.Metadata