diff --git a/app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt b/app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt
index 50ca75a4..0ca2e460 100644
--- a/app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt
+++ b/app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt
@@ -16,11 +16,14 @@ class AppResponseStore : ResponseStore() {
     override val internalResponseFactories = listOf(
         REQUEST_RESPONSE_GET_IP to MockRequestResponseFactory(
             request = MockRequest(IPIFY_ENDPOINT),
-            responseFactory = SimpleResponseFactory(200, "api/get_ip.json")
+            responseFactory = SimpleResponseFactory(code = 200, bodyFileName = "api/get_ip.json")
         ),
         REQUEST_RESPONSE_GET_IP_DETAILS to MockRequestResponseFactory(
             request = MockRequest("${IPINFO_ENDPOINT}$IP_ADDRESS/geo"),
-            responseFactory = SimpleResponseFactory(200, "api/get_ip_details.json")
+            responseFactory = SimpleResponseFactory(
+                code = 200,
+                bodyFileName = "api/get_ip_details.json"
+            )
         )
     )
 }
diff --git a/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt b/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt
index f95cca6b..28540e0f 100644
--- a/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt
+++ b/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt
@@ -5,11 +5,11 @@ import com.mitteloupe.whoami.test.server.MockResponse
 
 data class SimpleResponseFactory(
     private val code: Int = 200,
-    private val bodyFileName: String = "",
-    private val headers: List<Pair<String, String>> = emptyList()
+    private val headers: List<Pair<String, String>> = emptyList(),
+    private val bodyFileName: String? = null
 ) : MockResponseFactory {
     private val body by lazy {
-        if (bodyFileName.isEmpty()) {
+        if (bodyFileName == null) {
             ""
         } else {
             assetReader.getAssetAsString(bodyFileName)