createTestFromTemplate uses token
Made A testing token for use in tests
Fixed marshaling error
more token usage
Renaming
Merge branch 'master' into Experimental