diff --git a/src/test/java/io/appium/java_client/android/AndroidAbilityToUseSupplierTest.java b/src/test/java/io/appium/java_client/android/AndroidAbilityToUseSupplierTest.java
index 1a0cd129e..21389d54a 100644
--- a/src/test/java/io/appium/java_client/android/AndroidAbilityToUseSupplierTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidAbilityToUseSupplierTest.java
@@ -1,5 +1,6 @@
 package io.appium.java_client.android;
 
+import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.AppiumBy;
 import io.appium.java_client.functions.ActionSupplier;
 import io.appium.java_client.touch.offset.ElementOption;
@@ -46,8 +47,7 @@ public class AndroidAbilityToUseSupplierTest extends BaseAndroidTest {
                 .release();
 
     @Test public void horizontalSwipingWithSupplier() {
-        Activity activity = new Activity("io.appium.android.apis", ".view.Gallery1");
-        driver.startActivity(activity);
+        startActivity(".view.Gallery1");
         WebElement gallery = driver.findElement(By.id("io.appium.android.apis:id/gallery"));
         List<WebElement> images = gallery.findElements(AppiumBy.className("android.widget.ImageView"));
         int originalImageCount = images.size();
@@ -59,7 +59,8 @@ public class AndroidAbilityToUseSupplierTest extends BaseAndroidTest {
     }
 
     @Test public void verticalSwipingWithSupplier() throws Exception {
-        driver.resetApp();
+        driver.executeScript("mobile: terminateApp", ImmutableMap.of("appId", APP_ID));
+        driver.executeScript("mobile: activateApp", ImmutableMap.of("appId", APP_ID));
         driver.findElement(AppiumBy.accessibilityId("Views")).click();
 
         Point originalLocation = driver.findElement(AppiumBy.accessibilityId("Gallery")).getLocation();
diff --git a/src/test/java/io/appium/java_client/android/AndroidActivityTest.java b/src/test/java/io/appium/java_client/android/AndroidActivityTest.java
deleted file mode 100644
index 149a393c4..000000000
--- a/src/test/java/io/appium/java_client/android/AndroidActivityTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.appium.java_client.android;
-
-import io.appium.java_client.android.nativekey.AndroidKey;
-import io.appium.java_client.android.nativekey.KeyEvent;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class AndroidActivityTest extends BaseAndroidTest {
-
-    @BeforeEach public void setUp() {
-        Activity activity = new Activity("io.appium.android.apis", ".ApiDemos");
-        driver.startActivity(activity);
-    }
-
-    @Test public void startActivityInThisAppTestCase() {
-        Activity activity = new Activity("io.appium.android.apis",
-            ".accessibility.AccessibilityNodeProviderActivity");
-        driver.startActivity(activity);
-        assertEquals(driver.currentActivity(),
-            ".accessibility.AccessibilityNodeProviderActivity");
-    }
-
-    @Test public void startActivityWithWaitingAppTestCase() {
-        final Activity activity = new Activity("io.appium.android.apis",
-            ".accessibility.AccessibilityNodeProviderActivity")
-                .setAppWaitPackage("io.appium.android.apis")
-                .setAppWaitActivity(".accessibility.AccessibilityNodeProviderActivity");
-        driver.startActivity(activity);
-        assertEquals(driver.currentActivity(),
-            ".accessibility.AccessibilityNodeProviderActivity");
-    }
-
-    @Test public void startActivityInNewAppTestCase() {
-        Activity activity = new Activity("com.android.settings", ".Settings");
-        driver.startActivity(activity);
-        assertEquals(driver.currentActivity(), ".Settings");
-        driver.pressKey(new KeyEvent(AndroidKey.BACK));
-        assertEquals(driver.currentActivity(), ".ApiDemos");
-    }
-
-    @Test public void startActivityInNewAppTestCaseWithoutClosingApp() {
-        Activity activity = new Activity("io.appium.android.apis",
-            ".accessibility.AccessibilityNodeProviderActivity");
-        driver.startActivity(activity);
-        assertEquals(driver.currentActivity(), ".accessibility.AccessibilityNodeProviderActivity");
-
-        Activity newActivity = new Activity("com.android.settings", ".Settings")
-                .setAppWaitPackage("com.android.settings")
-                .setAppWaitActivity(".Settings")
-                .setStopApp(false);
-        driver.startActivity(newActivity);
-        assertEquals(driver.currentActivity(), ".Settings");
-        driver.pressKey(new KeyEvent(AndroidKey.BACK));
-        assertEquals(driver.currentActivity(), ".accessibility.AccessibilityNodeProviderActivity");
-    }
-}
diff --git a/src/test/java/io/appium/java_client/android/AndroidContextTest.java b/src/test/java/io/appium/java_client/android/AndroidContextTest.java
index 53a90f1dd..fdc47664b 100644
--- a/src/test/java/io/appium/java_client/android/AndroidContextTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidContextTest.java
@@ -26,8 +26,7 @@
 public class AndroidContextTest extends BaseAndroidTest {
 
     @BeforeAll public static void beforeClass2() throws Exception {
-        Activity activity = new Activity("io.appium.android.apis", ".view.WebView1");
-        driver.startActivity(activity);
+        startActivity(".view.WebView1");
         Thread.sleep(20000);
     }
 
diff --git a/src/test/java/io/appium/java_client/android/AndroidDriverTest.java b/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
index 246951d8a..45f048272 100644
--- a/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
@@ -16,6 +16,7 @@
 
 package io.appium.java_client.android;
 
+import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.appmanagement.ApplicationState;
 import org.apache.commons.io.FileUtils;
 import org.hamcrest.Matchers;
@@ -148,8 +149,8 @@ public void isAppNotInstalledTest() {
 
     @Test
     public void closeAppTest() {
-        driver.closeApp();
-        driver.launchApp();
+        driver.executeScript("mobile: terminateApp", ImmutableMap.of("appId", APP_ID));
+        driver.executeScript("mobile: activateApp", ImmutableMap.of("appId", APP_ID));
         assertEquals(".ApiDemos", driver.currentActivity());
     }
 
@@ -241,11 +242,6 @@ public void pullFileTest() {
         assert (data.length > 0);
     }
 
-    @Test
-    public void resetTest() {
-        driver.resetApp();
-    }
-
     @Test
     public void deviceDetailsAndKeyboardTest() {
         assertFalse(driver.isKeyboardShown());
@@ -255,7 +251,7 @@ public void deviceDetailsAndKeyboardTest() {
 
     @Test
     public void getSupportedPerformanceDataTypesTest() {
-        driver.startActivity(new Activity(APP_ID, ".ApiDemos"));
+        startActivity(".ApiDemos");
 
         List<String> dataTypes = new ArrayList<>();
         dataTypes.add("cpuinfo");
@@ -270,13 +266,11 @@ public void getSupportedPerformanceDataTypesTest() {
         for (int i = 0; i < supportedPerformanceDataTypes.size(); ++i) {
             assertEquals(dataTypes.get(i), supportedPerformanceDataTypes.get(i));
         }
-
-
     }
 
     @Test
     public void getPerformanceDataTest() {
-        driver.startActivity(new Activity(APP_ID, ".ApiDemos"));
+        startActivity(".ApiDemos");
 
         List<String> supportedPerformanceDataTypes = driver.getSupportedPerformanceDataTypes();
 
diff --git a/src/test/java/io/appium/java_client/android/AndroidElementTest.java b/src/test/java/io/appium/java_client/android/AndroidElementTest.java
index acb4d4dd2..44c8473d6 100644
--- a/src/test/java/io/appium/java_client/android/AndroidElementTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidElementTest.java
@@ -30,8 +30,7 @@
 public class AndroidElementTest extends BaseAndroidTest {
 
     @BeforeEach public void setup() {
-        Activity activity = new Activity("io.appium.android.apis", ".ApiDemos");
-        driver.startActivity(activity);
+        startActivity(".ApiDemos");
     }
 
 
@@ -57,8 +56,7 @@ public class AndroidElementTest extends BaseAndroidTest {
     @Test public void replaceValueTest() {
         String originalValue = "original value";
 
-        Activity activity = new Activity("io.appium.android.apis", ".view.Controls1");
-        driver.startActivity(activity);
+        startActivity(".view.Controls1");
         WebElement editElement = driver
             .findElement(AppiumBy.androidUIAutomator("resourceId(\"io.appium.android.apis:id/edit\")"));
         editElement.sendKeys(originalValue);
@@ -81,8 +79,7 @@ public class AndroidElementTest extends BaseAndroidTest {
     @Test public void setValueTest() {
         String value = "new value";
 
-        Activity activity = new Activity("io.appium.android.apis", ".view.Controls1");
-        driver.startActivity(activity);
+        startActivity(".view.Controls1");
         WebElement editElement = driver
             .findElement(AppiumBy.androidUIAutomator("resourceId(\"io.appium.android.apis:id/edit\")"));
         editElement.sendKeys(value);
diff --git a/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java b/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java
index 79a0d8870..79d327ae1 100644
--- a/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java
@@ -68,8 +68,7 @@ public class AndroidFunctionTest extends BaseAndroidTest {
     @BeforeAll
     public static void startWebViewActivity() {
         if (driver != null) {
-            Activity activity = new Activity("io.appium.android.apis", ".view.WebView1");
-            driver.startActivity(activity);
+            startActivity(".view.WebView1");
         }
     }
 
diff --git a/src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java b/src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java
index b0ec3a1e7..b9abd9ff6 100644
--- a/src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java
@@ -15,8 +15,7 @@ public class AndroidScreenRecordTest extends BaseAndroidTest {
 
     @BeforeEach
     public void setUp() {
-        Activity activity = new Activity("io.appium.android.apis", ".ApiDemos");
-        driver.startActivity(activity);
+        startActivity(".ApiDemos");
     }
 
     @Test
diff --git a/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java b/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java
index c9b06c49f..64390962d 100644
--- a/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java
@@ -30,8 +30,7 @@ public class AndroidSearchingTest extends BaseAndroidTest {
 
     @BeforeEach
     public void setup() {
-        Activity activity = new Activity("io.appium.android.apis", ".ApiDemos");
-        driver.startActivity(activity);
+        startActivity(".ApiDemos");
     }
 
     @Test  public void findByAccessibilityIdTest() {
diff --git a/src/test/java/io/appium/java_client/android/AndroidTouchTest.java b/src/test/java/io/appium/java_client/android/AndroidTouchTest.java
index f3c9c0394..84cb15753 100644
--- a/src/test/java/io/appium/java_client/android/AndroidTouchTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidTouchTest.java
@@ -1,5 +1,6 @@
 package io.appium.java_client.android;
 
+import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.AppiumBy;
 import io.appium.java_client.MultiTouchAction;
 import io.appium.java_client.TouchAction;
@@ -25,12 +26,12 @@ public class AndroidTouchTest extends BaseAndroidTest {
 
     @BeforeEach
     public void setUp() {
-        driver.resetApp();
+        driver.executeScript("mobile: terminateApp", ImmutableMap.of("appId", APP_ID));
+        driver.executeScript("mobile: activateApp", ImmutableMap.of("appId", APP_ID));
     }
 
     @Test public void dragNDropByElementTest() {
-        Activity activity = new Activity("io.appium.android.apis", ".view.DragAndDropDemo");
-        driver.startActivity(activity);
+        startActivity(".view.DragAndDropDemo");
         WebElement dragDot1 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_1"));
         WebElement dragDot3 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_3"));
 
@@ -46,8 +47,7 @@ public void setUp() {
     }
 
     @Test public void dragNDropByElementAndDurationTest() {
-        Activity activity = new Activity("io.appium.android.apis", ".view.DragAndDropDemo");
-        driver.startActivity(activity);
+        startActivity(".view.DragAndDropDemo");
         WebElement dragDot1 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_1"));
         WebElement dragDot3 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_3"));
 
@@ -65,8 +65,7 @@ public void setUp() {
     }
 
     @Test public void dragNDropByCoordinatesTest() {
-        Activity activity = new Activity("io.appium.android.apis", ".view.DragAndDropDemo");
-        driver.startActivity(activity);
+        startActivity(".view.DragAndDropDemo");
         WebElement dragDot1 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_1"));
         WebElement dragDot3 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_3"));
 
@@ -85,8 +84,7 @@ public void setUp() {
     }
 
     @Test public void dragNDropByCoordinatesAndDurationTest() {
-        Activity activity = new Activity("io.appium.android.apis", ".view.DragAndDropDemo");
-        driver.startActivity(activity);
+        startActivity(".view.DragAndDropDemo");
         WebElement dragDot1 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_1"));
         WebElement dragDot3 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_3"));
 
@@ -107,8 +105,7 @@ public void setUp() {
     }
 
     @Test public void pressByCoordinatesTest() {
-        Activity activity = new Activity("io.appium.android.apis", ".view.Buttons1");
-        driver.startActivity(activity);
+        startActivity(".view.Buttons1");
         Point point = driver.findElement(By.id("io.appium.android.apis:id/button_toggle")).getLocation();
         new TouchAction(driver)
                 .press(point(point.x + 20, point.y + 30))
@@ -119,8 +116,7 @@ public void setUp() {
     }
 
     @Test public void pressByElementTest() {
-        Activity activity = new Activity("io.appium.android.apis", ".view.Buttons1");
-        driver.startActivity(activity);
+        startActivity(".view.Buttons1");
         new TouchAction(driver)
                 .press(element(driver.findElement(By.id("io.appium.android.apis:id/button_toggle"))))
                 .waitAction(waitOptions(ofSeconds(1)))
@@ -130,8 +126,7 @@ public void setUp() {
     }
 
     @Test public void tapActionTestByElement() throws Exception {
-        Activity activity = new Activity("io.appium.android.apis", ".view.ChronometerDemo");
-        driver.startActivity(activity);
+        startActivity(".view.ChronometerDemo");
         WebElement chronometer = driver.findElement(By.id("io.appium.android.apis:id/chronometer"));
 
         TouchAction startStop = new TouchAction(driver)
@@ -148,8 +143,7 @@ public void setUp() {
     }
 
     @Test public void tapActionTestByCoordinates() throws Exception {
-        Activity activity = new Activity("io.appium.android.apis", ".view.ChronometerDemo");
-        driver.startActivity(activity);
+        startActivity(".view.ChronometerDemo");
         WebElement chronometer = driver.findElement(By.id("io.appium.android.apis:id/chronometer"));
 
         Point center1 = getCenter(driver.findElement(By.id("io.appium.android.apis:id/start")));
@@ -166,8 +160,7 @@ public void setUp() {
     }
 
     @Test public void horizontalSwipingTest() {
-        Activity activity = new Activity("io.appium.android.apis", ".view.Gallery1");
-        driver.startActivity(activity);
+        startActivity(".view.Gallery1");
 
         WebElement gallery = driver.findElement(By.id("io.appium.android.apis:id/gallery"));
         List<WebElement> images = gallery.findElements(AppiumBy.className("android.widget.ImageView"));
@@ -186,8 +179,7 @@ public void setUp() {
     }
 
     @Test public void multiTouchTest() {
-        Activity activity = new Activity("io.appium.android.apis", ".view.Buttons1");
-        driver.startActivity(activity);
+        startActivity(".view.Buttons1");
         TouchAction press = new TouchAction(driver)
                 .press(element(driver.findElement(By.id("io.appium.android.apis:id/button_toggle"))))
                 .waitAction(waitOptions(ofSeconds(1)))
diff --git a/src/test/java/io/appium/java_client/android/BaseAndroidTest.java b/src/test/java/io/appium/java_client/android/BaseAndroidTest.java
index d5eb6840f..28c1c95f4 100644
--- a/src/test/java/io/appium/java_client/android/BaseAndroidTest.java
+++ b/src/test/java/io/appium/java_client/android/BaseAndroidTest.java
@@ -16,6 +16,7 @@
 
 package io.appium.java_client.android;
 
+import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.android.options.UiAutomator2Options;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
@@ -59,4 +60,13 @@ public class BaseAndroidTest {
             service.stop();
         }
     }
+
+    public static void startActivity(String name) {
+        driver.executeScript(
+                "mobile: startActivity",
+                ImmutableMap.of(
+                        "component", String.format("%s/%s", APP_ID, name)
+                )
+        );
+    }
 }
diff --git a/src/test/java/io/appium/java_client/android/ClipboardTest.java b/src/test/java/io/appium/java_client/android/ClipboardTest.java
index 353d9a579..7b576bcc2 100644
--- a/src/test/java/io/appium/java_client/android/ClipboardTest.java
+++ b/src/test/java/io/appium/java_client/android/ClipboardTest.java
@@ -16,6 +16,7 @@
 
 package io.appium.java_client.android;
 
+import com.google.common.collect.ImmutableMap;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -24,7 +25,8 @@
 public class ClipboardTest extends BaseAndroidTest {
 
     @BeforeEach public void setUp() {
-        driver.resetApp();
+        driver.executeScript("mobile: terminateApp", ImmutableMap.of("appId", APP_ID));
+        driver.executeScript("mobile: activateApp", ImmutableMap.of("appId", APP_ID));
     }
 
     @Test public void verifySetAndGetClipboardText() {
diff --git a/src/test/java/io/appium/java_client/android/IntentTest.java b/src/test/java/io/appium/java_client/android/IntentTest.java
deleted file mode 100644
index ba4888821..000000000
--- a/src/test/java/io/appium/java_client/android/IntentTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package io.appium.java_client.android;
-
-import io.appium.java_client.android.options.UiAutomator2Options;
-import io.appium.java_client.service.local.AppiumDriverLocalService;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.openqa.selenium.By;
-
-import java.util.function.Predicate;
-
-import static io.appium.java_client.TestResources.intentExampleApk;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class IntentTest {
-    private static AppiumDriverLocalService service;
-    protected static AndroidDriver driver;
-
-    /**
-     * initialization.
-     */
-    @BeforeAll public static void beforeClass() {
-        service = AppiumDriverLocalService.buildDefaultService();
-        service.start();
-
-        if (service == null || !service.isRunning()) {
-            throw new RuntimeException("An appium server node is not started!");
-        }
-
-        UiAutomator2Options options = new UiAutomator2Options()
-                .setDeviceName("Android Emulator")
-                .setApp(intentExampleApk().toAbsolutePath().toString());
-        driver = new AndroidDriver(service.getUrl(), options);
-    }
-
-    /**
-     * finishing.
-     */
-    @AfterAll public static void afterClass() {
-        if (driver != null) {
-            driver.quit();
-        }
-        if (service != null) {
-            service.stop();
-        }
-    }
-
-
-    @Test public void startActivityWithIntent() {
-        Predicate<AndroidDriver> predicate = driver -> {
-            Activity activity = new Activity("com.android.mms",
-                    ".ui.ComposeMessageActivity")
-                    .setIntentAction("android.intent.action.SEND")
-                    .setIntentCategory("android.intent.category.DEFAULT")
-                    .setIntentFlags("0x4000000")
-                    .setOptionalIntentArguments("-d \"TestIntent\" -t \"text/plain\"");
-            driver.startActivity(activity);
-            return true;
-        };
-        assertTrue(predicate.test(driver));
-
-    }
-
-    @Test public void startActivityWithDefaultIntentAndDefaultCategoryWithOptionalArgs() {
-        final Activity activity = new Activity("com.prgguru.android", ".GreetingActivity")
-                .setIntentAction("android.intent.action.MAIN")
-                .setIntentCategory("android.intent.category.DEFAULT")
-                .setIntentFlags("0x4000000")
-                .setOptionalIntentArguments("--es \"USERNAME\" \"AppiumIntentTest\" -t \"text/plain\"");
-        driver.startActivity(activity);
-        assertEquals(driver.findElement(By.id("com.prgguru.android:id/textView1")).getText(),
-            "Welcome AppiumIntentTest");
-    }
-}
diff --git a/src/test/java/io/appium/java_client/android/KeyCodeTest.java b/src/test/java/io/appium/java_client/android/KeyCodeTest.java
index 7c50f4ceb..7ed431166 100644
--- a/src/test/java/io/appium/java_client/android/KeyCodeTest.java
+++ b/src/test/java/io/appium/java_client/android/KeyCodeTest.java
@@ -33,8 +33,7 @@ public class KeyCodeTest extends BaseAndroidTest {
 
     @BeforeEach
     public void setUp() {
-        final Activity activity = new Activity(driver.getCurrentPackage(), ".text.KeyEventText");
-        driver.startActivity(activity);
+        startActivity(".text.KeyEventText");
     }
 
     @Test
diff --git a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
index bfb4e576a..1c5848934 100644
--- a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
+++ b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
@@ -1,5 +1,6 @@
 package io.appium.java_client.android;
 
+import com.google.common.collect.ImmutableMap;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.WebDriverWait;
@@ -13,7 +14,9 @@
 public class OpenNotificationsTest extends BaseAndroidTest {
     @Test
     public void openNotification() {
-        driver.closeApp();
+        driver.executeScript("mobile: terminateApp", ImmutableMap.of(
+                "appId", APP_ID
+        ));
         driver.openNotifications();
         WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(20));
         assertNotEquals(0, wait.until(input -> {
diff --git a/src/test/java/io/appium/java_client/android/UIAutomator2Test.java b/src/test/java/io/appium/java_client/android/UIAutomator2Test.java
index 0d9da052d..47ac3239b 100644
--- a/src/test/java/io/appium/java_client/android/UIAutomator2Test.java
+++ b/src/test/java/io/appium/java_client/android/UIAutomator2Test.java
@@ -59,8 +59,7 @@ public void testPortraitUpsideDown() {
     @Test
     public void testToastMSGIsDisplayed() {
         final WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(30));
-        Activity activity = new Activity("io.appium.android.apis", ".view.PopupMenu1");
-        driver.startActivity(activity);
+        startActivity(".view.PopupMenu1");
 
         wait.until(ExpectedConditions.presenceOfElementLocated(AppiumBy
                 .accessibilityId("Make a Popup!")));
diff --git a/src/test/java/io/appium/java_client/ios/IOSDriverTest.java b/src/test/java/io/appium/java_client/ios/IOSDriverTest.java
index f977289c0..6ead922b8 100644
--- a/src/test/java/io/appium/java_client/ios/IOSDriverTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSDriverTest.java
@@ -18,7 +18,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.appmanagement.ApplicationState;
-import io.appium.java_client.remote.HideKeyboardStrategy;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -29,8 +28,6 @@
 import org.openqa.selenium.remote.RemoteWebElement;
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.http.HttpMethod;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
 
 import java.time.Duration;
 
@@ -60,10 +57,10 @@ public void addCustomCommandTest() {
 
     @Test
     public void addCustomCommandWithSessionIdTest() {
-        driver.addCommand(HttpMethod.POST, "/session/" + driver.getSessionId() + "/appium/app/launch",
-                "launchApplication");
-        final Response launchApplication = driver.execute("launchApplication");
-        assertNotNull(launchApplication.getSessionId());
+        driver.addCommand(HttpMethod.POST, "/session/" + driver.getSessionId() + "/appium/app/strings",
+                "getAppStrings");
+        final Response getStrings = driver.execute("getAppStrings");
+        assertNotNull(getStrings.getSessionId());
     }
 
     @Test
@@ -85,14 +82,8 @@ public void getDeviceTimeTest() {
     }
 
     @Test public void resetTest() {
-        driver.resetApp();
-    }
-
-    @Test public void hideKeyboardWithParametersTest() {
-        new WebDriverWait(driver, Duration.ofSeconds(30))
-                .until(ExpectedConditions.presenceOfElementLocated(By.id("IntegerA")))
-                .click();
-        driver.hideKeyboard(HideKeyboardStrategy.PRESS_KEY, "Done");
+        driver.executeScript("mobile: terminateApp", ImmutableMap.of("bundleId", BUNDLE_ID));
+        driver.executeScript("mobile: activateApp", ImmutableMap.of("bundleId", BUNDLE_ID));
     }
 
     @Disabled
@@ -170,7 +161,7 @@ public void putAIntoBackgroundWithoutRestoreTest() {
         driver.toggleTouchIDEnrollment(true);
         driver.performTouchID(true);
         driver.performTouchID(false);
-        //noinspection SimplifiableAssertion
+        //noinspection SimplifiableAssertion,EqualsWithItself
         assertEquals(true, true);
     }
 }