Added more tests for tokens