Down-converted to .NET 4.x and updated tests