added MarshalXML and test for token