Added Token to tenant object model, and updated tenant resources and unit tests