Merge "Add missing v2 token related testcases"