diff --git a/TestObjectiveDropbox/IntegrationTests/TestAppType.h b/TestObjectiveDropbox/IntegrationTests/TestAppType.h
index f6e1988a2..40f97483f 100644
--- a/TestObjectiveDropbox/IntegrationTests/TestAppType.h
+++ b/TestObjectiveDropbox/IntegrationTests/TestAppType.h
@@ -9,10 +9,9 @@
 #import <Foundation/Foundation.h>
 
 typedef NS_ENUM(NSInteger, ApiAppPermissionType) {
-  FullDropbox,
-  TeamMemberFileAccess,
-  TeamMemberManagement,
+  FullDropboxScoped,
+  FullDropboxScopedForTeamTesting,
 };
 
 /// Toggle this variable depending on which set of tests you are running.
-static ApiAppPermissionType appPermission = (ApiAppPermissionType)FullDropbox;
+static ApiAppPermissionType appPermission = (ApiAppPermissionType)FullDropboxScoped;
diff --git a/TestObjectiveDropbox/IntegrationTests/TestClasses.h b/TestObjectiveDropbox/IntegrationTests/TestClasses.h
index 18f3d3366..3ab97fbb0 100644
--- a/TestObjectiveDropbox/IntegrationTests/TestClasses.h
+++ b/TestObjectiveDropbox/IntegrationTests/TestClasses.h
@@ -14,6 +14,7 @@
 @class TeamTests;
 
 @interface DropboxTester : NSObject
++ (NSArray<NSString *>*_Nonnull)scopesForTests;
 - (nonnull instancetype)initWithUserClient:(DBUserClient *_Nonnull)userClient testData:(TestData *_Nonnull)testData;
 - (nonnull instancetype)initWithTestData:(TestData * _Nonnull)testData;
 
@@ -29,7 +30,7 @@
 @end
 
 @interface DropboxTeamTester : NSObject
-
++ (NSArray<NSString *>*_Nonnull)scopesForTests;
 - (nonnull instancetype)initWithTeamClient:(DBTeamClient *_Nonnull)teamClient testData:(TestData * _Nonnull)testData;
 - (nonnull instancetype)initWithTestData:(TestData * _Nonnull)testData;
 
diff --git a/TestObjectiveDropbox/IntegrationTests/TestClasses.m b/TestObjectiveDropbox/IntegrationTests/TestClasses.m
index 8c509947c..bf8f2f06f 100644
--- a/TestObjectiveDropbox/IntegrationTests/TestClasses.m
+++ b/TestObjectiveDropbox/IntegrationTests/TestClasses.m
@@ -19,6 +19,10 @@ void MyLog(NSString *format, ...) {
 }
 
 @implementation DropboxTester
++ (NSArray<NSString *>*)scopesForTests {
+    return [@"account_info.read files.content.read files.content.write files.metadata.read files.metadata.write sharing.write sharing.read" componentsSeparatedByString:@" "];
+}
+
 - (instancetype)initWithUserClient:(DBUserClient *)userClient testData:(TestData *)testData {
     self = [super init];
     if (self) {
@@ -228,6 +232,14 @@ - (void)testUsersEndpoints:(void (^)(void))nextTest {
 @end
 
 @implementation DropboxTeamTester
++ (NSArray<NSString *>*)scopesForTests {
+    NSString *scopesForTeamRoutesTests = @"groups.read groups.write members.delete members.read members.write sessions.list team_data.member team_info.read";
+    NSString *scopesForMemberFileAccessUserTests = @"files.content.write files.content.read sharing.write account_info.read";
+    return [[NSString stringWithFormat:@"%@ %@",
+             scopesForTeamRoutesTests,
+             scopesForMemberFileAccessUserTests] componentsSeparatedByString:@" "];
+}
+
 - (instancetype)initWithTeamClient:(DBTeamClient *)teamClient testData:(TestData * _Nonnull)testData {
     self = [super init];
     if (self) {
diff --git a/TestObjectiveDropbox/IntegrationTests/TestData.h b/TestObjectiveDropbox/IntegrationTests/TestData.h
index e0dc29337..7f6654735 100644
--- a/TestObjectiveDropbox/IntegrationTests/TestData.h
+++ b/TestObjectiveDropbox/IntegrationTests/TestData.h
@@ -62,10 +62,4 @@
 @property(nonatomic, copy) NSString * _Nonnull fullDropboxAppKey;
 @property(nonatomic, copy) NSString * _Nonnull fullDropboxAppSecret;
 
-@property(nonatomic, copy) NSString * _Nonnull teamMemberFileAccessAppKey;
-@property(nonatomic, copy) NSString * _Nonnull teamMemberFileAccessAppSecret;
-
-@property(nonatomic, copy) NSString * _Nonnull teamMemberManagementAppKey;
-@property(nonatomic, copy) NSString * _Nonnull teamMemberManagementAppSecret;
-
 @end
diff --git a/TestObjectiveDropbox/IntegrationTests/TestData.m b/TestObjectiveDropbox/IntegrationTests/TestData.m
index dfbf63eaa..98bc1cd24 100644
--- a/TestObjectiveDropbox/IntegrationTests/TestData.m
+++ b/TestObjectiveDropbox/IntegrationTests/TestData.m
@@ -50,12 +50,6 @@ - (instancetype)init {
     // App key and secret
     _fullDropboxAppKey = @"<FULL_DROPBOX_APP_KEY>";
     _fullDropboxAppSecret = @"<FULL_DROPBOX_APP_SECRET>";
-
-    _teamMemberFileAccessAppKey = @"<TEAM_MEMBER_FILE_ACCESS_APP_KEY>";
-    _teamMemberFileAccessAppSecret = @"<FULL_DROPBOX_APP_SECRET>";
-
-    _teamMemberManagementAppKey = @"<TEAM_MEMBER_MANAGEMENT_APP_KEY>";
-    _teamMemberManagementAppSecret = @"<TEAM_MEMBER_MANAGEMENT_APP_SECRET>";
   }
   return self;
 }
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_iOS/AppDelegate.m b/TestObjectiveDropbox/TestObjectiveDropbox_iOS/AppDelegate.m
index bec7baf39..d0d9f200a 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_iOS/AppDelegate.m
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_iOS/AppDelegate.m
@@ -27,9 +27,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
   TestData *data = [TestData new];
 
-  if ([data.fullDropboxAppSecret containsString:@"<"] ||
-      [data.teamMemberFileAccessAppKey containsString:@"<"] ||
-      [data.teamMemberManagementAppKey containsString:@"<"]) {
+  if ([data.fullDropboxAppSecret containsString:@"<"]) {
     NSLog(@"\n\n\nMust set test data (in TestData.h) before launching app.\n\n\nTerminating.....\n\n");
     exit(0);
   }
@@ -51,10 +49,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
                                        delegateQueue:[NSOperationQueue new]
                               forceForegroundSession:NO
                            sharedContainerIdentifier:[NSBundle mainBundle].bundleIdentifier];
-  DBTransportDefaultConfig *transportConfigTeamFileAccess =
-    [[DBTransportDefaultConfig alloc] initWithAppKey:data.teamMemberFileAccessAppKey appSecret:data.teamMemberFileAccessAppSecret];
-  DBTransportDefaultConfig *transportConfigTeamManagement =
-    [[DBTransportDefaultConfig alloc] initWithAppKey:data.teamMemberManagementAppKey appSecret:data.teamMemberManagementAppSecret];
 
   void (^networkGlobalResponseBlock)(DBRequestError *, DBTask *) =
   ^(DBRequestError *networkError, DBTask *restartTask) {
@@ -70,14 +64,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   [DBGlobalErrorResponseHandler registerNetworkErrorResponseBlock:networkGlobalResponseBlock];
 
   switch (appPermission) {
-  case FullDropbox:
+  case FullDropboxScoped:
       [DBClientsManager setupWithTransportConfig:transportConfigFullDropbox];
       break;
-  case TeamMemberFileAccess:
-      [DBClientsManager setupWithTeamTransportConfig:transportConfigTeamFileAccess];
-      break;
-  case TeamMemberManagement:
-      [DBClientsManager setupWithTeamTransportConfig:transportConfigTeamManagement];
+  case FullDropboxScopedForTeamTesting:
+      [DBClientsManager setupWithTeamTransportConfig:transportConfigFullDropbox];
       break;
   }
 
@@ -162,12 +153,11 @@ - (BOOL)db_handleAuthUrl:(NSURL *)url {
 
   BOOL handled = NO;
   switch (appPermission) {
-    case FullDropbox: {
+    case FullDropboxScoped: {
       handled = [DBClientsManager handleRedirectURL:url completion:completion];
       break;
     }
-    case TeamMemberFileAccess:
-    case TeamMemberManagement:
+    case FullDropboxScopedForTeamTesting:
       handled = [DBClientsManager handleRedirectURLTeam:url completion:completion];
     break;
   }
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_iOS/Base.lproj/Main.storyboard b/TestObjectiveDropbox/TestObjectiveDropbox_iOS/Base.lproj/Main.storyboard
index e9ca4be60..2da16de78 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_iOS/Base.lproj/Main.storyboard
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_iOS/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -19,50 +19,43 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Il-qF-Vab">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Il-qF-Vab">
                                 <rect key="frame" x="104.5" y="438.5" width="166" height="30"/>
                                 <state key="normal" title="Unlink Dropbox Account"/>
                                 <connections>
                                     <action selector="unlinkButtonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="lzJ-ZW-kww"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b9W-gk-MoP">
-                                <rect key="frame" x="111.5" y="258.5" width="152" height="30"/>
-                                <state key="normal" title="Link Dropbox Account"/>
-                                <connections>
-                                    <action selector="tokenFlowlinkButton:" destination="BYZ-38-t0r" eventType="touchUpInside" id="L1r-FM-vZV"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="db5-aq-giW">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="db5-aq-giW">
                                 <rect key="frame" x="140.5" y="118.5" width="94" height="30"/>
                                 <state key="normal" title="Run API Tests"/>
                                 <connections>
                                     <action selector="runTestsButtonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Lj1-FW-imk"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lAs-Sd-MXl">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lAs-Sd-MXl">
                                 <rect key="frame" x="38" y="318.5" width="299" height="30"/>
                                 <state key="normal" title="Read info and return to official Dropbox app"/>
                                 <connections>
                                     <action selector="openWithButtonPressedRunTests:" destination="BYZ-38-t0r" eventType="touchUpInside" id="2jH-2n-WvR"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KMW-d6-mUc">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KMW-d6-mUc">
                                 <rect key="frame" x="107.5" y="158.5" width="160" height="30"/>
                                 <state key="normal" title="Run BatchUpload Tests"/>
                                 <connections>
                                     <action selector="runBatchUploadTestsButtonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="dhR-J7-UtW"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KTl-EQ-KEH">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KTl-EQ-KEH">
                                 <rect key="frame" x="94.5" y="198.5" width="186" height="30"/>
                                 <state key="normal" title="Run Global Response Tests"/>
                                 <connections>
                                     <action selector="runGlobalResponseTestsButtonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="W88-Xe-Tty"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="luI-bu-yCb">
-                                <rect key="frame" x="52" y="288" width="270" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="luI-bu-yCb">
+                                <rect key="frame" x="52.5" y="288.5" width="270" height="30"/>
                                 <state key="normal" title="Link Dropbox Account (pkce code flow)"/>
                                 <connections>
                                     <action selector="codeFlowlinkButton:" destination="BYZ-38-t0r" eventType="touchUpInside" id="y4x-3n-29X"/>
@@ -71,8 +64,6 @@
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="b9W-gk-MoP" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" constant="-60" id="AKt-Sh-DWa"/>
-                            <constraint firstItem="b9W-gk-MoP" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="JeO-KH-8c6"/>
                             <constraint firstItem="0Il-qF-Vab" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="KZa-p9-Tp7"/>
                             <constraint firstItem="KMW-d6-mUc" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="O2J-vQ-A1K"/>
                             <constraint firstItem="db5-aq-giW" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="O8l-MN-ZX0"/>
@@ -93,7 +84,6 @@
                         <outlet property="runBatchUploadTestsButton" destination="KMW-d6-mUc" id="Ody-5w-o9z"/>
                         <outlet property="runGlobalResponseTestsButton" destination="KTl-EQ-KEH" id="Ion-L3-Ck9"/>
                         <outlet property="runTestsButton" destination="db5-aq-giW" id="UYY-YH-dIy"/>
-                        <outlet property="tokenFlowlinkButton" destination="b9W-gk-MoP" id="DvX-Jl-kU2"/>
                         <outlet property="unlinkButton" destination="0Il-qF-Vab" id="oAz-BA-Qf0"/>
                     </connections>
                 </viewController>
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_iOS/ViewController.m b/TestObjectiveDropbox/TestObjectiveDropbox_iOS/ViewController.m
index 15b1b8baf..a4e1428a0 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_iOS/ViewController.m
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_iOS/ViewController.m
@@ -17,7 +17,6 @@
 
 @interface ViewController ()
 
-@property (weak, nonatomic) IBOutlet UIButton *tokenFlowlinkButton;
 @property (weak, nonatomic) IBOutlet UIButton *codeFlowlinkButton;
 @property (weak, nonatomic) IBOutlet UIButton *runTestsButton;
 @property (weak, nonatomic) IBOutlet UIButton *unlinkButton;
@@ -29,17 +28,18 @@ @interface ViewController ()
 
 @implementation ViewController
 
-- (IBAction)tokenFlowlinkButton:(id)sender {
-  [DBClientsManager authorizeFromController:[UIApplication sharedApplication]
-                                      controller:self
-                                         openURL:^(NSURL *url) {
-                                           [[UIApplication sharedApplication] openURL:url];
-                                         }];
-}
-
 - (IBAction)codeFlowlinkButton:(id)sender {
+    NSArray<NSString*>*scopes = @[];
+    switch (appPermission) {
+        case FullDropboxScoped:
+            scopes = [DropboxTester scopesForTests];
+            break;
+        case FullDropboxScopedForTeamTesting:
+            scopes = [DropboxTeamTester scopesForTests];
+            break;
+    }
   DBScopeRequest *scopeRequest = [[DBScopeRequest alloc] initWithScopeType:DBScopeTypeUser
-                                                                    scopes:@[@"account_info.read"]
+                                                                    scopes:scopes
                                                       includeGrantedScopes:NO];
   [DBClientsManager authorizeFromControllerV2:[UIApplication sharedApplication]
                                    controller:self
@@ -58,14 +58,13 @@ - (IBAction)runTestsButtonPressed:(id)sender {
     };
 
     switch (appPermission) {
-        case FullDropbox:
+        case FullDropboxScoped:
             [[[DropboxTester alloc] initWithTestData:data] testAllUserAPIEndpoints:unlink asMember:NO];
             break;
-        case TeamMemberFileAccess:
-            [[[DropboxTeamTester alloc] initWithTestData:data] testAllTeamMemberFileAcessActions:unlink];
-            break;
-        case TeamMemberManagement:
-            [[[DropboxTeamTester alloc] initWithTestData:data] testAllTeamMemberManagementActions:unlink];
+        case FullDropboxScopedForTeamTesting:
+            [[[DropboxTeamTester alloc] initWithTestData:data] testAllTeamMemberFileAcessActions:^() {
+                [[[DropboxTeamTester alloc] initWithTestData:data] testAllTeamMemberManagementActions:unlink];
+            }];
             break;
     }
 }
@@ -149,14 +148,12 @@ - (void)didReceiveMemoryWarning {
 
 - (void)checkButtons {
     if ([DBClientsManager authorizedClient] || [DBClientsManager authorizedTeamClient]) {
-        _tokenFlowlinkButton.hidden = YES;
         _codeFlowlinkButton.hidden = YES;
         _unlinkButton.hidden = NO;
         _runTestsButton.hidden = NO;
         _runBatchUploadTestsButton.hidden = NO;
         _runGlobalResponseTestsButton.hidden = NO;
     } else {
-        _tokenFlowlinkButton.hidden = NO;
         _codeFlowlinkButton.hidden = NO;
         _unlinkButton.hidden = YES;
         _runTestsButton.hidden = YES;
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_iOSTests/FileRoutesTests.m b/TestObjectiveDropbox/TestObjectiveDropbox_iOSTests/FileRoutesTests.m
index d45e4825c..fd166c61d 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_iOSTests/FileRoutesTests.m
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_iOSTests/FileRoutesTests.m
@@ -3,8 +3,6 @@
 #import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
 #import "TestAuthTokenGenerator.h"
 
-static NSString *scopesForFileRoutesTests = @"account_info.read files.content.read files.content.write files.metadata.read files.metadata.write sharing.write sharing.read";
-
 @interface FileRoutesTests : XCTestCase
 @end
 
@@ -17,7 +15,7 @@ @implementation FileRoutesTests {
 
 - (DBUserClient *)createUserClient {
     self.continueAfterFailure = NO;
-    // You need an API app with the "Full Dropbox" permission type and at least the scopes in scopesForFileRoutesTests
+    // You need an API app with the "Full Dropbox" permission type and at least the scopes in DropoboxTester.scopesForTests
     // and no team scopes.
     // You can create one for testing here: https://www.dropbox.com/developers/apps/create
     // The 'App key' will be on the app's info page.
@@ -27,7 +25,7 @@ - (DBUserClient *)createUserClient {
     NSString *fileRoutesTestsAuthToken = [TestAuthTokenGenerator
                                           refreshToken:[TestAuthTokenGenerator environmentVariableForKey:@"FULL_DROPBOX_TESTER_USER_REFRESH_TOKEN"]
                                           apiKey:apiAppKey
-                                          scopes:[scopesForFileRoutesTests componentsSeparatedByString:@" "]];
+                                          scopes:[DropboxTester scopesForTests]];
     XCTAssertNotNil(fileRoutesTestsAuthToken, @"Error obtaining auth token.");
 
     _delegateQueue = [[NSOperationQueue alloc] init];
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_iOSTests/TeamRoutesTests.m b/TestObjectiveDropbox/TestObjectiveDropbox_iOSTests/TeamRoutesTests.m
index e20752b2f..a33d1befe 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_iOSTests/TeamRoutesTests.m
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_iOSTests/TeamRoutesTests.m
@@ -3,9 +3,6 @@
 #import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
 #import "TestAuthTokenGenerator.h"
 
-static NSString *scopesForTeamRoutesTests = @"groups.read groups.write members.delete members.read members.write sessions.list team_data.member team_info.read";
-static NSString *scopesForMemberFileAccessUserTests = @"files.content.write files.content.read sharing.write account_info.read";
-
 @interface TeamRoutesTests : XCTestCase
 @end
 
@@ -31,19 +28,16 @@ - (void)setUp {
 }
 
 - (DBTeamClient *)createTeamClient {
-    // You need an API app with the "Full Dropbox" permission type and at least the scopes in scopesForTeamRoutesTests+scopesForMemberFileAccessUserTests
+    // You need an API app with the "Full Dropbox" permission type and at least the scopes in DropboxTeamTester.scopesForTests
     // You can create one for testing here: https://www.dropbox.com/developers/apps/create
     // The 'App key' will be on the app's info page.
     // Then follow https://dropbox.tech/developers/pkce--what-and-why- to get a refresh token using the PKCE flow
 
-    NSMutableArray<NSString *>*scopes = [[scopesForTeamRoutesTests componentsSeparatedByString:@" "] mutableCopy];
-    [scopes addObjectsFromArray:[scopesForMemberFileAccessUserTests componentsSeparatedByString:@" "]];
-
     NSString *apiAppKey = [TestAuthTokenGenerator environmentVariableForKey:@"FULL_DROPBOX_API_APP_KEY"];
     NSString *teamRoutesTestsAuthToken = [TestAuthTokenGenerator
                                           refreshToken:[TestAuthTokenGenerator environmentVariableForKey:@"FULL_DROPBOX_TESTER_TEAM_REFRESH_TOKEN"]
                                           apiKey:apiAppKey
-                                          scopes:scopes];
+                                          scopes:[DropboxTeamTester scopesForTests]];
     XCTAssertNotNil(teamRoutesTestsAuthToken, @"Errors obtaining auth token.");
 
     _delegateQueue = [[NSOperationQueue alloc] init];
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_macOS/AppDelegate.m b/TestObjectiveDropbox/TestObjectiveDropbox_macOS/AppDelegate.m
index 0534bfc3a..8ae375b6e 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_macOS/AppDelegate.m
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_macOS/AppDelegate.m
@@ -28,9 +28,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 
   TestData *data = [TestData new];
 
-  if ([data.fullDropboxAppSecret containsString:@"<"] ||
-      [data.teamMemberFileAccessAppKey containsString:@"<"] ||
-      [data.teamMemberManagementAppKey containsString:@"<"]) {
+  if ([data.fullDropboxAppSecret containsString:@"<"]) {
     NSLog(@"\n\n\nMust set test data (in TestData.h) before launching app.\n\n\nTerminating.....\n\n");
     exit(0);
   }
@@ -46,20 +44,13 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 
   DBTransportDefaultConfig *transportConfigFullDropbox =
     [[DBTransportDefaultConfig alloc] initWithAppKey:data.fullDropboxAppKey appSecret:data.fullDropboxAppSecret];
-  DBTransportDefaultConfig *transportConfigTeamFileAccess =
-    [[DBTransportDefaultConfig alloc] initWithAppKey:data.teamMemberFileAccessAppKey appSecret:data.teamMemberFileAccessAppSecret];
-  DBTransportDefaultConfig *transportConfigTeamManagement =
-    [[DBTransportDefaultConfig alloc] initWithAppKey:data.teamMemberManagementAppKey appSecret:data.teamMemberManagementAppSecret];
   
   switch (appPermission) {
-    case FullDropbox:
+    case FullDropboxScoped:
       [DBClientsManager setupWithTransportConfigDesktop:transportConfigFullDropbox];
       break;
-    case TeamMemberFileAccess:
-      [DBClientsManager setupWithTeamTransportConfigDesktop:transportConfigTeamFileAccess];
-      break;
-    case TeamMemberManagement:
-      [DBClientsManager setupWithTeamTransportConfigDesktop:transportConfigTeamManagement];
+    case FullDropboxScopedForTeamTesting:
+      [DBClientsManager setupWithTeamTransportConfigDesktop:transportConfigFullDropbox];
       break;
   }
   viewController = (ViewController *)[[[NSApplication sharedApplication] windows] objectAtIndex:0].contentViewController;
@@ -93,12 +84,11 @@ - (void)handleAppleEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSApple
     [self checkButtons];
   };
   switch (appPermission) {
-    case FullDropbox: {
+    case FullDropboxScoped: {
       [DBClientsManager handleRedirectURL:url completion:oauthCompletion];
       break;
     }
-    case TeamMemberFileAccess:
-    case TeamMemberManagement: {
+      case FullDropboxScopedForTeamTesting: {
       [DBClientsManager handleRedirectURLTeam:url completion:oauthCompletion];
       break;
     }
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_macOS/Base.lproj/Main.storyboard b/TestObjectiveDropbox/TestObjectiveDropbox_macOS/Base.lproj/Main.storyboard
index 63e2c0ee3..8ca33e495 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_macOS/Base.lproj/Main.storyboard
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_macOS/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -688,17 +688,6 @@
                                     </connections>
                                 </buttonCell>
                             </button>
-                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SoD-Th-rjR">
-                                <rect key="frame" x="180" y="142" width="120" height="32"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <buttonCell key="cell" type="push" title="Link Dropbox" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="nfi-Ou-4Eh">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="tokenFlowLinkButtonPressed:" target="XfG-lQ-9wD" id="RbS-Bg-s07"/>
-                                </connections>
-                            </button>
                             <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PxJ-2o-gM6">
                                 <rect key="frame" x="147" y="49" width="187" height="32"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -725,9 +714,7 @@
                     </view>
                     <connections>
                         <outlet property="codeFlowlinkButton" destination="CeA-c3-XyZ" id="VHV-VQ-Uoc"/>
-                        <outlet property="linkButton" destination="nfi-Ou-4Eh" id="P7n-dk-wLf"/>
                         <outlet property="runTestsButton" destination="3RD-VZ-XuW" id="P7n-ak-BV6"/>
-                        <outlet property="tokenFlowlinkButton" destination="SoD-Th-rjR" id="ayl-Xb-5dk"/>
                         <outlet property="unlinkButton" destination="PxJ-2o-gM6" id="4gH-bj-ftR"/>
                     </connections>
                 </viewController>
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_macOS/ViewController.m b/TestObjectiveDropbox/TestObjectiveDropbox_macOS/ViewController.m
index fdcf2946f..dbce05fe6 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_macOS/ViewController.m
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_macOS/ViewController.m
@@ -23,17 +23,18 @@ @interface ViewController ()
 
 @implementation ViewController
 
-- (IBAction)tokenFlowLinkButtonPressed:(id)sender {
-    [DBClientsManager authorizeFromControllerDesktop:[NSWorkspace sharedWorkspace]
-                                          controller:self
-                                             openURL:^(NSURL *url) {
-        [[NSWorkspace sharedWorkspace] openURL:url];
-    }];
-}
-
 - (IBAction)codeFlowLinkButtonPressed:(id)sender {
+    NSArray<NSString*>*scopes = @[];
+    switch (appPermission) {
+        case FullDropboxScoped:
+            scopes = [DropboxTester scopesForTests];
+            break;
+        case FullDropboxScopedForTeamTesting:
+            scopes = [DropboxTeamTester scopesForTests];
+            break;
+    }
     DBScopeRequest *scopeRequest = [[DBScopeRequest alloc] initWithScopeType:DBScopeTypeUser
-                                                                      scopes:@[@"account_info.read"]
+                                                                      scopes:scopes
                                                         includeGrantedScopes:NO];
     [DBClientsManager authorizeFromControllerDesktopV2:[NSWorkspace sharedWorkspace]
                                             controller:self
@@ -52,14 +53,13 @@ - (IBAction)runTestsButtonPressed:(id)sender {
     };
     
     switch (appPermission) {
-        case FullDropbox:
+        case FullDropboxScoped:
             [[[DropboxTester alloc] initWithTestData:data] testAllUserAPIEndpoints:unlink asMember:NO];
             break;
-        case TeamMemberFileAccess:
-            [[[DropboxTeamTester alloc] initWithTestData:data] testAllTeamMemberFileAcessActions:unlink];
-            break;
-        case TeamMemberManagement:
-            [[[DropboxTeamTester alloc] initWithTestData:data] testAllTeamMemberManagementActions:unlink];
+        case FullDropboxScopedForTeamTesting:
+            [[[DropboxTeamTester alloc] initWithTestData:data] testAllTeamMemberFileAcessActions:^() {
+                [[[DropboxTeamTester alloc] initWithTestData:data] testAllTeamMemberManagementActions:unlink];
+            }];
             break;
     }
 }