diff --git a/pic-sure-resources/pic-sure-passthrough-resource/src/test/java/edu/harvard/hms/dbmi/avillach/resource/passthru/PassThroughResourceRSTest.java b/pic-sure-resources/pic-sure-passthrough-resource/src/test/java/edu/harvard/hms/dbmi/avillach/resource/passthru/PassThroughResourceRSTest.java
index cdee4cec..52e8d60f 100644
--- a/pic-sure-resources/pic-sure-passthrough-resource/src/test/java/edu/harvard/hms/dbmi/avillach/resource/passthru/PassThroughResourceRSTest.java
+++ b/pic-sure-resources/pic-sure-passthrough-resource/src/test/java/edu/harvard/hms/dbmi/avillach/resource/passthru/PassThroughResourceRSTest.java
@@ -2,8 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -139,7 +138,7 @@ void testQueryResult() throws Exception {
         when(httpResponse.getStatusLine()).thenReturn(statusLine);
         when(httpResponse.getEntity()).thenReturn(httpResponseEntity);
         when(httpClient.retrievePostResponse(anyString(), any(Header[].class), anyString())).thenReturn(httpResponse);
-        when(httpClient.readObjectFromResponse(any(HttpResponse.class), StandardCharsets.ISO_8859_1)).thenReturn("4");
+        when(httpClient.readObjectFromResponse(any(HttpResponse.class), eq(StandardCharsets.UTF_8))).thenReturn("4");
 
         assertThrows(ProtocolException.class, () -> {
             resource.queryResult("", null);
diff --git a/pic-sure-resources/pic-sure-resource-api/src/test/java/edu/harvard/dbmi/avillach/service/ResourceWebClientTest.java b/pic-sure-resources/pic-sure-resource-api/src/test/java/edu/harvard/dbmi/avillach/service/ResourceWebClientTest.java
index 6ed3c094..8b20b335 100644
--- a/pic-sure-resources/pic-sure-resource-api/src/test/java/edu/harvard/dbmi/avillach/service/ResourceWebClientTest.java
+++ b/pic-sure-resources/pic-sure-resource-api/src/test/java/edu/harvard/dbmi/avillach/service/ResourceWebClientTest.java
@@ -292,7 +292,7 @@ public void testQuery() throws JsonProcessingException {
     @Test
     public void testQueryResult() throws JsonProcessingException {
         String testId = "230048";
-        String mockResult = "{}";
+        byte[] mockResult = new byte[] {};
 
 
 
@@ -341,8 +341,8 @@ public void testQueryResult() throws JsonProcessingException {
         Response result = cut.queryResult(testURL, testId, queryRequest);
         assertNotNull("Result should not be null", result);
         // String resultContent = IOUtils.toString((InputStream) result.getEntity(), "UTF-8");
-        String resultContent = (String) result.getEntity();
-        assertEquals("Result should match " + mockResult, mockResult, resultContent);
+        byte[] resultContent = (byte[]) result.getEntity();
+        assertArrayEquals("Result should match " + mockResult, mockResult, resultContent);
 
         // What if the resource has a problem?
         wireMockRule.stubFor(any(urlMatching("/query/.*/result")).willReturn(aResponse().withStatus(500)));