diff --git a/.github/workflows/instrumentation-test.yml b/.github/workflows/instrumentation-test.yml
index 9df11b9c..b90c631c 100644
--- a/.github/workflows/instrumentation-test.yml
+++ b/.github/workflows/instrumentation-test.yml
@@ -24,7 +24,7 @@ on:
 
 jobs:
   run-instrumentation-test:
-    runs-on: macOS-latest-large # enables hardware acceleration in the virtual machine
+    runs-on: ubuntu-latest # enables hardware acceleration in the virtual machine
     permissions:
       pull-requests: write
     timeout-minutes: 30
diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt
index 54a6f25a..21cb7013 100644
--- a/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt
+++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt
@@ -96,7 +96,7 @@ class GoogleMapViewTests {
         initMap()
         assertEquals(CameraMoveStartedReason.NO_MOVEMENT_YET, cameraPositionState.cameraMoveStartedReason)
         zoom(shouldAnimate = true, zoomIn = true) {
-            composeTestRule.waitUntil(timeout2) {
+            composeTestRule.waitUntil(timeout5) {
                 cameraPositionState.isMoving
             }
             assertTrue(cameraPositionState.isMoving)
@@ -108,7 +108,7 @@ class GoogleMapViewTests {
     fun testCameraReportsNotMoving() {
         initMap()
         zoom(shouldAnimate = true, zoomIn = true) {
-            composeTestRule.waitUntil(timeout2) {
+            composeTestRule.waitUntil(timeout5) {
                 cameraPositionState.isMoving
             }
             composeTestRule.waitUntil(timeout5) {
@@ -118,32 +118,14 @@ class GoogleMapViewTests {
         }
     }
 
-    @Test
-    fun testCameraZoomInAnimation() {
-        initMap()
-        zoom(shouldAnimate = true, zoomIn = true) {
-            composeTestRule.waitUntil(timeout2) {
-                cameraPositionState.isMoving
-            }
-            composeTestRule.waitUntil(timeout3) {
-                !cameraPositionState.isMoving
-            }
-            assertEquals(
-                startingZoom + 1f,
-                cameraPositionState.position.zoom,
-                assertRoundingError.toFloat()
-            )
-        }
-    }
-
     @Test
     fun testCameraZoomIn() {
         initMap()
         zoom(shouldAnimate = false, zoomIn = true) {
-            composeTestRule.waitUntil(timeout2) {
+            composeTestRule.waitUntil(timeout5) {
                 cameraPositionState.isMoving
             }
-            composeTestRule.waitUntil(timeout3) {
+            composeTestRule.waitUntil(timeout5) {
                 !cameraPositionState.isMoving
             }
             assertEquals(
@@ -158,10 +140,10 @@ class GoogleMapViewTests {
     fun testCameraZoomOut() {
         initMap()
         zoom(shouldAnimate = false, zoomIn = false) {
-            composeTestRule.waitUntil(timeout2) {
+            composeTestRule.waitUntil(timeout5) {
                 cameraPositionState.isMoving
             }
-            composeTestRule.waitUntil(timeout3) {
+            composeTestRule.waitUntil(timeout5) {
                 !cameraPositionState.isMoving
             }
             assertEquals(
@@ -176,10 +158,10 @@ class GoogleMapViewTests {
     fun testCameraZoomOutAnimation() {
         initMap()
         zoom(shouldAnimate = true, zoomIn = false) {
-            composeTestRule.waitUntil(timeout2) {
+            composeTestRule.waitUntil(timeout5) {
                 cameraPositionState.isMoving
             }
-            composeTestRule.waitUntil(timeout3) {
+            composeTestRule.waitUntil(timeout5) {
                 !cameraPositionState.isMoving
             }
             assertEquals(
@@ -202,19 +184,6 @@ class GoogleMapViewTests {
         }
     }
 
-    @Test
-    fun testLatLngNotInVisibleRegion() {
-        initMap()
-        composeTestRule.runOnUiThread {
-            val projection = cameraPositionState.projection
-            assertNotNull(projection)
-            val latLng = LatLng(23.4, 25.6)
-            assertFalse(
-                projection!!.visibleRegion.latLngBounds.contains(latLng)
-            )
-        }
-    }
-
     @Test(expected = IllegalStateException::class)
     fun testMarkerStateCannotBeReused() {
         initMap {
diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/TestUtils.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/TestUtils.kt
index 98c56236..75464db0 100644
--- a/maps-app/src/androidTest/java/com/google/maps/android/compose/TestUtils.kt
+++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/TestUtils.kt
@@ -2,8 +2,7 @@ package com.google.maps.android.compose
 
 import com.google.android.gms.maps.model.LatLng
 import org.junit.Assert.assertEquals
-const val timeout2 = 2_000L
-const val timeout3 = 3_000L
+
 const val timeout5 = 5_000L
 
 val hasValidApiKey: Boolean =