Made A testing token for use in tests
Fixed marshaling error