Unifying marshalling/unmarshalling code

Since, test code deals with intermediate xmls that don't conform to the schema, I have disabled this.