Added Token requirements & tests.