Changed the namespace a little as well as modifying the C# test code to deal with the modified namespace