Merge "Enhance test to rescope token using v2"