Tests related modifications - passes all tests except two
Modified test which not passed because of different ToString values for the Java and C#