CSharp version is done
Fixed a test error and tidy up usings