use new infrastructure in C# tests