C#: All tests now work correctly, added minor changes to XmasEntity