Added type to token schema, tests, and tokens are defaulted to basic if nothing is passed in.