Refactoring
Improve acceptance tests for csharp