Fix some tests
Version bump to 6.0
Something something build break
Clean up NuGet generation