diff --git a/buildSrc/src/main/kotlin/FirebaseTestLabConfig.kt b/buildSrc/src/main/kotlin/FirebaseTestLabConfig.kt
index 14e43a11c6..9b682bb7b5 100644
--- a/buildSrc/src/main/kotlin/FirebaseTestLabConfig.kt
+++ b/buildSrc/src/main/kotlin/FirebaseTestLabConfig.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ fun Project.configureFirebaseTestLabForMicroBenchmark() {
     devices.set(
       listOf(
         mapOf(
-          "model" to "panther",
+          "model" to "husky",
           "version" to "${project.extensions.getByType(LibraryExtension::class.java).compileSdk}",
           "locale" to "en_US",
         ),
diff --git a/buildSrc/src/main/kotlin/Sdk.kt b/buildSrc/src/main/kotlin/Sdk.kt
index db34e079c1..d267f5733a 100644
--- a/buildSrc/src/main/kotlin/Sdk.kt
+++ b/buildSrc/src/main/kotlin/Sdk.kt
@@ -15,7 +15,7 @@
  */
 
 object Sdk {
-  const val COMPILE_SDK = 33
+  const val COMPILE_SDK = 34
   const val TARGET_SDK = 31
 
   // Engine and SDC must support API 24.
diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
index 8726fc504f..d3cb14ecfe 100644
--- a/datacapture/build.gradle.kts
+++ b/datacapture/build.gradle.kts
@@ -52,7 +52,10 @@ android {
     getByName("test").apply { resources.setSrcDirs(listOf("sampledata")) }
   }
 
-  testOptions { animationsDisabled = true }
+  testOptions {
+    animationsDisabled = true
+    targetSdk = Sdk.TARGET_SDK
+  }
   kotlin { jvmToolchain(11) }
 }
 
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index c99e17be73..7d9ec366af 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -43,7 +43,6 @@ import java.time.Instant
 import java.time.OffsetDateTime
 import java.util.Date
 import java.util.LinkedList
-import kotlin.streams.toList
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flow
@@ -129,11 +128,9 @@ internal open class TestDownloadManagerImpl(
     urls.poll()?.let { DownloadRequest.of(it) }
 
   override suspend fun getSummaryRequestUrls() =
-    queries
-      .stream()
-      .map { ResourceType.fromCode(it.substringBefore("?")) to it.plus("?_summary=count") }
-      .toList()
-      .toMap()
+    queries.associate {
+      ResourceType.fromCode(it.substringBefore("?")) to it.plus("?_summary=count")
+    }
 
   override suspend fun processResponse(response: Resource): Collection<Resource> {
     val patient = Patient().setMeta(Meta().setLastUpdated(Date()))