Merge "Add test to rescope token using v2"