Added tests for tokens