Merge "leverage executor to test_token/version.py in TestAPI"