Merge "Unskip test_rescope_token()"