Fix csharp

Attempts to fix some CSharp tests.