Merge "Add tests for ApiCheckToken"