Test case fixes for updates to .NET Framework