Test fixes for .NET 2.0