diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.patch-modules.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.patch-modules.gradle.kts
index e6e8825b9..6282658cb 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.patch-modules.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/com.hedera.gradle.patch-modules.gradle.kts
@@ -113,13 +113,6 @@ extraJavaModuleInfo {
     module("com.google.api.grpc:proto-google-common-protos", "com.google.api.grpc.common")
 
     // Testing only
-    module("com.fasterxml.jackson.core:jackson-annotations", "com.fasterxml.jackson.annotations")
-    module("com.fasterxml.jackson.core:jackson-core", "com.fasterxml.jackson.core")
-    module("com.fasterxml.jackson.core:jackson-databind", "com.fasterxml.jackson.databind") {
-        exportAllPackages()
-        requireAllDefinedDependencies()
-        requires("java.sql")
-    }
     module("io.grpc:grpc-netty-shaded", "io.grpc.netty.shaded") {
         exportAllPackages()
         requireAllDefinedDependencies()
diff --git a/sdk-dependency-versions/build.gradle.kts b/sdk-dependency-versions/build.gradle.kts
index 75dd5e4e5..261937872 100644
--- a/sdk-dependency-versions/build.gradle.kts
+++ b/sdk-dependency-versions/build.gradle.kts
@@ -69,6 +69,9 @@ dependencies.constraints {
     }
 
     // Testing
+    api("com.fasterxml.jackson.core:jackson-core:2.18.0") {
+        because("com.fasterxml.jackson.core")
+    }
     api("io.github.cdimascio:java-dotenv:5.3.1") {
         because("java.dotenv")
     }
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountAllowanceApproveTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountAllowanceApproveTransactionTest.java
index dff2e9d01..ada2e8804 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountAllowanceApproveTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountAllowanceApproveTransactionTest.java
@@ -47,7 +47,7 @@ public class AccountAllowanceApproveTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountAllowanceDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountAllowanceDeleteTransactionTest.java
index 9c0324c36..d8f21eab6 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountAllowanceDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountAllowanceDeleteTransactionTest.java
@@ -39,7 +39,7 @@ public class AccountAllowanceDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountBalanceQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountBalanceQueryTest.java
index 185b61a19..b43763872 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountBalanceQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountBalanceQueryTest.java
@@ -28,7 +28,7 @@
 public class AccountBalanceQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountCreateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountCreateTransactionTest.java
index ab41eb21a..a997f9b3c 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountCreateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountCreateTransactionTest.java
@@ -40,7 +40,7 @@ public class AccountCreateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountDeleteTransactionTest.java
index 6cd3283ef..a9ad9c4e3 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountDeleteTransactionTest.java
@@ -39,7 +39,7 @@ public class AccountDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountIdTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountIdTest.java
index 2fa29b0b3..12e242ebb 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountIdTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountIdTest.java
@@ -39,7 +39,7 @@ class AccountIdTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
         mainnetClient = Client.forMainnet();
         testnetClient = Client.forTestnet();
         previewnetClient = Client.forPreviewnet();
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoQueryTest.java
index cad60c030..4a74a3528 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoQueryTest.java
@@ -28,7 +28,7 @@
 public class AccountInfoQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoTest.java
index 3fcee995d..2500af52a 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoTest.java
@@ -60,7 +60,7 @@ public class AccountInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountRecordsQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountRecordsQueryTest.java
index fcfddc002..5e2d4366e 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountRecordsQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountRecordsQueryTest.java
@@ -28,7 +28,7 @@
 public class AccountRecordsQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountStakersQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountStakersQueryTest.java
index 42b908967..2015b2e3c 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountStakersQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountStakersQueryTest.java
@@ -28,7 +28,7 @@
 public class AccountStakersQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountUpdateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountUpdateTransactionTest.java
index 86172fa72..06af2f055 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountUpdateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountUpdateTransactionTest.java
@@ -40,7 +40,7 @@ public class AccountUpdateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AllowancesTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AllowancesTest.java
index adae5cf5e..11b235320 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AllowancesTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AllowancesTest.java
@@ -34,7 +34,7 @@
 public class AllowancesTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AssessedCustomFeeTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/AssessedCustomFeeTest.java
index b4d6cb6ef..d111a21bd 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/AssessedCustomFeeTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/AssessedCustomFeeTest.java
@@ -30,7 +30,7 @@ public class AssessedCustomFeeTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractByteCodeQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractByteCodeQueryTest.java
index 60435ef04..514cd9243 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractByteCodeQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractByteCodeQueryTest.java
@@ -28,7 +28,7 @@
 public class ContractByteCodeQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractCallQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractCallQueryTest.java
index ef5747797..7e1e33cb0 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractCallQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractCallQueryTest.java
@@ -35,7 +35,7 @@ public class ContractCallQueryTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractCreateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractCreateTransactionTest.java
index 1b224ae04..d044aa21b 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractCreateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractCreateTransactionTest.java
@@ -41,7 +41,7 @@ public class ContractCreateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractDeleteTransactionTest.java
index 1cd1cc48f..841be3025 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractDeleteTransactionTest.java
@@ -39,7 +39,7 @@ public class ContractDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractExecuteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractExecuteTransactionTest.java
index 3399298fc..7912f01c4 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractExecuteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractExecuteTransactionTest.java
@@ -40,7 +40,7 @@ public class ContractExecuteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractFunctionParametersTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractFunctionParametersTest.java
index 47c53609e..dddfb5a66 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractFunctionParametersTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractFunctionParametersTest.java
@@ -44,7 +44,7 @@
 public class ContractFunctionParametersTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractIdTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractIdTest.java
index 9405dfa89..f7522a5f4 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractIdTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractIdTest.java
@@ -32,7 +32,7 @@
 class ContractIdTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractInfoQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractInfoQueryTest.java
index 59c35075b..6c16d2d19 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractInfoQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractInfoQueryTest.java
@@ -28,7 +28,7 @@
 public class ContractInfoQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractInfoTest.java
index 7b4d9078f..4188b1391 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractInfoTest.java
@@ -47,7 +47,7 @@ public class ContractInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractLogInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractLogInfoTest.java
index d6654eb15..358569620 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractLogInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractLogInfoTest.java
@@ -21,7 +21,7 @@ public class ContractLogInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractNonceInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractNonceInfoTest.java
index 1821917e0..a9c3c6f5b 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractNonceInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractNonceInfoTest.java
@@ -16,7 +16,7 @@ public class ContractNonceInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractUpdateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractUpdateTransactionTest.java
index f9f065466..f16c49e0a 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractUpdateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ContractUpdateTransactionTest.java
@@ -40,7 +40,7 @@ public class ContractUpdateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/CryptoTransferTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/CryptoTransferTransactionTest.java
index 926d8ffa7..e9d673352 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/CryptoTransferTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/CryptoTransferTransactionTest.java
@@ -42,7 +42,7 @@ public class CryptoTransferTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFeeListTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFeeListTest.java
index 5d8f70267..10219974d 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFeeListTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFeeListTest.java
@@ -32,7 +32,7 @@
 public class CustomFeeListTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFixedFeeTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFixedFeeTest.java
index 6ef3a0e2c..913709a2f 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFixedFeeTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFixedFeeTest.java
@@ -40,7 +40,7 @@ public class CustomFixedFeeTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFractionalFeeTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFractionalFeeTest.java
index 3ac77404b..0771c91cc 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFractionalFeeTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomFractionalFeeTest.java
@@ -27,7 +27,7 @@ public class CustomFractionalFeeTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomRoyaltyFeeTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomRoyaltyFeeTest.java
index c033e872e..5ab1dca14 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomRoyaltyFeeTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/CustomRoyaltyFeeTest.java
@@ -43,7 +43,7 @@ public class CustomRoyaltyFeeTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/DelegateContractIdTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/DelegateContractIdTest.java
index 73d58154b..70d17abd1 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/DelegateContractIdTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/DelegateContractIdTest.java
@@ -29,7 +29,7 @@
 class DelegateContractIdTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/EthereumTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/EthereumTransactionTest.java
index 7dfe891bf..baa8144b9 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/EthereumTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/EthereumTransactionTest.java
@@ -19,7 +19,7 @@ public class EthereumTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FeeSchedulesTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FeeSchedulesTest.java
index 991816ec3..fcf9dec41 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FeeSchedulesTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FeeSchedulesTest.java
@@ -31,7 +31,7 @@
 public class FeeSchedulesTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileAppendTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileAppendTransactionTest.java
index c740dd243..c7be96651 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileAppendTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileAppendTransactionTest.java
@@ -91,7 +91,7 @@ public class FileAppendTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileContentsQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileContentsQueryTest.java
index 5eec539f9..9911fb244 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileContentsQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileContentsQueryTest.java
@@ -28,7 +28,7 @@
 public class FileContentsQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileCreateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileCreateTransactionTest.java
index 1f1e1f64c..d7e8208b7 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileCreateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileCreateTransactionTest.java
@@ -39,7 +39,7 @@ public class FileCreateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileDeleteTransactionTest.java
index 0909312f8..2a40687f9 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileDeleteTransactionTest.java
@@ -39,7 +39,7 @@ public class FileDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileIdTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileIdTest.java
index 08aa14fb4..cbcf26ab6 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileIdTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileIdTest.java
@@ -29,7 +29,7 @@
 class FileIdTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileInfoQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileInfoQueryTest.java
index dd53e4fc1..2bb229aac 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileInfoQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileInfoQueryTest.java
@@ -28,7 +28,7 @@
 public class FileInfoQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileInfoTest.java
index b2d8fae0a..3fbbb64b4 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileInfoTest.java
@@ -47,7 +47,7 @@ public class FileInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileUpdateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileUpdateTransactionTest.java
index 076a82cf1..70fba11b0 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FileUpdateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FileUpdateTransactionTest.java
@@ -39,7 +39,7 @@ public class FileUpdateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/FreezeTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/FreezeTransactionTest.java
index ceab19e5a..51e1daf61 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/FreezeTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/FreezeTransactionTest.java
@@ -49,7 +49,7 @@ public class FreezeTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashAddTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashAddTransactionTest.java
index cbe69a6ef..d27509851 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashAddTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashAddTransactionTest.java
@@ -21,7 +21,7 @@ class LiveHashAddTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashDeleteTransactionTest.java
index 83904c890..ed687d7f2 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashDeleteTransactionTest.java
@@ -20,7 +20,7 @@ class LiveHashDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashQueryTest.java
index 45c1ba6f0..5bc859aab 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/LiveHashQueryTest.java
@@ -11,7 +11,7 @@ public class LiveHashQueryTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/MessageSubmitTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/MessageSubmitTransactionTest.java
index 07a8f981e..187b0ecb9 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/MessageSubmitTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/MessageSubmitTransactionTest.java
@@ -39,7 +39,7 @@ public class MessageSubmitTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/NetworkVersionInfoQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/NetworkVersionInfoQueryTest.java
index 21ed0fedf..d05f3fec6 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/NetworkVersionInfoQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/NetworkVersionInfoQueryTest.java
@@ -11,7 +11,7 @@
 public class NetworkVersionInfoQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/NetworkVersionInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/NetworkVersionInfoTest.java
index 840daea7c..3920aa6b3 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/NetworkVersionInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/NetworkVersionInfoTest.java
@@ -10,7 +10,7 @@
 public class NetworkVersionInfoTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/NftIdTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/NftIdTest.java
index ba1468f46..cb313d93f 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/NftIdTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/NftIdTest.java
@@ -38,7 +38,7 @@ class NftIdTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
         mainnetClient = Client.forMainnet();
         testnetClient = Client.forTestnet();
         previewnetClient = Client.forPreviewnet();
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeCreateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeCreateTransactionTest.java
index 6ae9ca100..4760e728e 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeCreateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeCreateTransactionTest.java
@@ -68,7 +68,7 @@ public class NodeCreateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeDeleteTransactionTest.java
index f55716e4b..67ea54004 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeDeleteTransactionTest.java
@@ -43,7 +43,7 @@ public class NodeDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeUpdateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeUpdateTransactionTest.java
index b49355b6f..b07b52c90 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeUpdateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeUpdateTransactionTest.java
@@ -72,7 +72,7 @@ public class NodeUpdateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/PrngTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/PrngTransactionTest.java
index df00eb906..948076080 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/PrngTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/PrngTransactionTest.java
@@ -36,7 +36,7 @@ public class PrngTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ProxyStakerTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ProxyStakerTest.java
index 3c8dce924..0ab2f70eb 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ProxyStakerTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ProxyStakerTest.java
@@ -14,7 +14,7 @@ public class ProxyStakerTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleCreateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleCreateTransactionTest.java
index 086ae13f4..ff055cce1 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleCreateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleCreateTransactionTest.java
@@ -37,7 +37,7 @@ public class ScheduleCreateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleDeleteTransactionTest.java
index 72c9172b0..d9eed28d1 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleDeleteTransactionTest.java
@@ -39,7 +39,7 @@ public class ScheduleDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleInfoQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleInfoQueryTest.java
index 5e87aaae3..31d584475 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleInfoQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleInfoQueryTest.java
@@ -28,7 +28,7 @@
 public class ScheduleInfoQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleInfoTest.java
index a76f37602..4f15f7c45 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleInfoTest.java
@@ -20,7 +20,7 @@ public class ScheduleInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleSignTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleSignTransactionTest.java
index c6622fc5e..6c987f231 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleSignTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/ScheduleSignTransactionTest.java
@@ -37,7 +37,7 @@ public class ScheduleSignTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/Snapshot.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/Snapshot.java
new file mode 100644
index 000000000..8487204e8
--- /dev/null
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/Snapshot.java
@@ -0,0 +1,75 @@
+package com.hedera.hashgraph.sdk;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.PrettyPrinter;
+import com.fasterxml.jackson.core.util.DefaultIndenter;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.core.util.Separators;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+
+final class Snapshot {
+    private static final ObjectMapper objectMapper = buildObjectMapper();
+
+    /**
+     * Workaround for an incompatibility between latest Jackson and json-snapshot libs.
+     * <p>
+     * Intended to replace {@code io.github.jsonSnapshot.SnapshotMatcher#defaultJsonFunction}
+     *
+     * @see <a href="https://github.com/json-snapshot/json-snapshot.github.io/issues/27">Issue in json-snapshot project</a>
+     */
+    static String asJsonString(Object object) {
+        try {
+            return objectMapper.writer(buildDefaultPrettyPrinter()).writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    /**
+     * Unmodified copy of {@code io.github.jsonSnapshot.SnapshotMatcher#buildObjectMapper}
+     */
+    private static ObjectMapper buildObjectMapper() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        objectMapper.setVisibility(
+            objectMapper
+                .getSerializationConfig()
+                .getDefaultVisibilityChecker()
+                .withFieldVisibility(JsonAutoDetect.Visibility.ANY)
+                .withGetterVisibility(JsonAutoDetect.Visibility.NONE)
+                .withSetterVisibility(JsonAutoDetect.Visibility.NONE)
+                .withCreatorVisibility(JsonAutoDetect.Visibility.NONE));
+        return objectMapper;
+    }
+
+    /**
+     * Modified copy of {@code io.github.jsonSnapshot.SnapshotMatcher#buildDefaultPrettyPrinter}
+     */
+    private static PrettyPrinter buildDefaultPrettyPrinter() {
+        DefaultPrettyPrinter pp =
+            new DefaultPrettyPrinter() {
+                @Override
+                @Nonnull
+                public DefaultPrettyPrinter createInstance() {
+                    return this;
+                }
+                @Override
+                public void writeObjectFieldValueSeparator(JsonGenerator jg) throws IOException {
+                    jg.writeRaw(": ");
+                }
+            };
+        DefaultPrettyPrinter.Indenter lfOnlyIndenter = new DefaultIndenter("  ", "\n");
+        pp.indentArraysWith(lfOnlyIndenter);
+        pp.indentObjectsWith(lfOnlyIndenter);
+        return pp;
+    }
+}
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/StakingInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/StakingInfoTest.java
index 20ea87979..e4af2fdcd 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/StakingInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/StakingInfoTest.java
@@ -14,7 +14,7 @@ public class StakingInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemDeleteTransactionTest.java
index 652d6f0c1..b65c7dfca 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemDeleteTransactionTest.java
@@ -46,7 +46,7 @@ public class SystemDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemUndeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemUndeleteTransactionTest.java
index 0150c6b8d..965d07aef 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemUndeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemUndeleteTransactionTest.java
@@ -39,7 +39,7 @@ public class SystemUndeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAirdropTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAirdropTransactionTest.java
index 85dc3e51e..e0708b937 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAirdropTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAirdropTransactionTest.java
@@ -52,7 +52,7 @@ public void setUp() {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAssociateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAssociateTransactionTest.java
index 0563f5d4d..ae14c4200 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAssociateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAssociateTransactionTest.java
@@ -46,7 +46,7 @@ public class TokenAssociateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAssociationTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAssociationTest.java
index b3218ded3..d2adbfee7 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAssociationTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenAssociationTest.java
@@ -16,7 +16,7 @@ public class TokenAssociationTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenBurnTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenBurnTransactionTest.java
index 3c3f88044..300972dec 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenBurnTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenBurnTransactionTest.java
@@ -45,7 +45,7 @@ public class TokenBurnTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenCancelAirdropTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenCancelAirdropTransactionTest.java
index 147bd2582..548e0b5e6 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenCancelAirdropTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenCancelAirdropTransactionTest.java
@@ -43,7 +43,7 @@ class TokenCancelAirdropTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenClaimAirdropTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenClaimAirdropTransactionTest.java
index 45a78258e..7445670a4 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenClaimAirdropTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenClaimAirdropTransactionTest.java
@@ -43,7 +43,7 @@ class TokenClaimAirdropTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenCreateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenCreateTransactionTest.java
index 16b74d614..286c7ea46 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenCreateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenCreateTransactionTest.java
@@ -84,7 +84,7 @@ public class TokenCreateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenDeleteTransactionTest.java
index a1941df49..e58b2d053 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenDeleteTransactionTest.java
@@ -41,7 +41,7 @@ public class TokenDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenDissociateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenDissociateTransactionTest.java
index 0dea0fbfc..9635c3dfe 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenDissociateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenDissociateTransactionTest.java
@@ -46,7 +46,7 @@ public class TokenDissociateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenFeeScheduleUpdateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenFeeScheduleUpdateTransactionTest.java
index 921624474..b7e2bea70 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenFeeScheduleUpdateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenFeeScheduleUpdateTransactionTest.java
@@ -38,7 +38,7 @@ public class TokenFeeScheduleUpdateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenFreezeTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenFreezeTransactionTest.java
index ab6b03eca..017d6cfb2 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenFreezeTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenFreezeTransactionTest.java
@@ -39,7 +39,7 @@ public class TokenFreezeTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenGrantKycTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenGrantKycTransactionTest.java
index 4bb0390b8..d912ca40a 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenGrantKycTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenGrantKycTransactionTest.java
@@ -43,7 +43,7 @@ public class TokenGrantKycTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenInfoQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenInfoQueryTest.java
index 924e14ded..5579b4e35 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenInfoQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenInfoQueryTest.java
@@ -32,7 +32,7 @@ public class TokenInfoQueryTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenInfoTest.java
index 3d82f4abe..6e0dfa52f 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenInfoTest.java
@@ -93,7 +93,7 @@ public class TokenInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenMintTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenMintTransactionTest.java
index 0053cc395..fe20d79cd 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenMintTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenMintTransactionTest.java
@@ -28,7 +28,7 @@ public class TokenMintTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenNftInfoQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenNftInfoQueryTest.java
index 5d7bab65e..d3910563e 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenNftInfoQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenNftInfoQueryTest.java
@@ -11,7 +11,7 @@
 public class TokenNftInfoQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenNftInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenNftInfoTest.java
index 35ce458c3..4d290be15 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenNftInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenNftInfoTest.java
@@ -16,7 +16,7 @@ public class TokenNftInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenPauseTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenPauseTransactionTest.java
index ef99024f4..8afd61f51 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenPauseTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenPauseTransactionTest.java
@@ -41,7 +41,7 @@ public class TokenPauseTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRejectTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRejectTransactionTest.java
index 415a90f10..6ca229b6f 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRejectTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRejectTransactionTest.java
@@ -54,7 +54,7 @@ public class TokenRejectTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRelationshipTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRelationshipTest.java
index d96e713a3..a0e202fb5 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRelationshipTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRelationshipTest.java
@@ -10,7 +10,7 @@
 public class TokenRelationshipTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRevokeKycTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRevokeKycTransactionTest.java
index 7f156951f..e8a270028 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRevokeKycTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenRevokeKycTransactionTest.java
@@ -43,7 +43,7 @@ public class TokenRevokeKycTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenSupplyTypeTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenSupplyTypeTest.java
index e1bc732d3..fbfdf4067 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenSupplyTypeTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenSupplyTypeTest.java
@@ -14,7 +14,7 @@ public class TokenSupplyTypeTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenTypeTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenTypeTest.java
index 9e1c06dd7..dbc37dba6 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenTypeTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenTypeTest.java
@@ -32,7 +32,7 @@ public class TokenTypeTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUnfreezeTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUnfreezeTransactionTest.java
index 21e5a2673..de42e6e29 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUnfreezeTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUnfreezeTransactionTest.java
@@ -39,7 +39,7 @@ public class TokenUnfreezeTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUnpauseTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUnpauseTransactionTest.java
index 26e56eb35..a92dbaefe 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUnpauseTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUnpauseTransactionTest.java
@@ -42,7 +42,7 @@ public class TokenUnpauseTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUpdateNftsTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUpdateNftsTransactionTest.java
index 824641a69..16d45e1d0 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUpdateNftsTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUpdateNftsTransactionTest.java
@@ -45,7 +45,7 @@ public class TokenUpdateNftsTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUpdateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUpdateTransactionTest.java
index f38ee86da..bade583e9 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUpdateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenUpdateTransactionTest.java
@@ -78,7 +78,7 @@ public class TokenUpdateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenWipeTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenWipeTransactionTest.java
index 0e3a4c19c..5fb777400 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenWipeTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TokenWipeTransactionTest.java
@@ -47,7 +47,7 @@ public class TokenWipeTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicCreateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicCreateTransactionTest.java
index 1612ec17c..2528b67d2 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicCreateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicCreateTransactionTest.java
@@ -40,7 +40,7 @@ public class TopicCreateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicDeleteTransactionTest.java
index 09971927a..964e8a33d 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicDeleteTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicDeleteTransactionTest.java
@@ -39,7 +39,7 @@ public class TopicDeleteTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicIdTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicIdTest.java
index 28e836850..a2d5df673 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicIdTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicIdTest.java
@@ -29,7 +29,7 @@
 class TopicIdTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicInfoQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicInfoQueryTest.java
index 9ee4eaf73..23d2d1642 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicInfoQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicInfoQueryTest.java
@@ -28,7 +28,7 @@
 public class TopicInfoQueryTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicInfoTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicInfoTest.java
index ecd3d6ad9..a75437b51 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicInfoTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicInfoTest.java
@@ -55,7 +55,7 @@ public class TopicInfoTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicMessageQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicMessageQueryTest.java
index e78974cc6..18adba0c1 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicMessageQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicMessageQueryTest.java
@@ -76,7 +76,7 @@ class TopicMessageQueryTest {
 
     @BeforeAll
     static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicMessageSubmitTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicMessageSubmitTransactionTest.java
index 185627e3e..0ff928f52 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicMessageSubmitTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicMessageSubmitTransactionTest.java
@@ -24,7 +24,7 @@ public class TopicMessageSubmitTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicUpdateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicUpdateTransactionTest.java
index 5fc1e2e26..6214b4755 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicUpdateTransactionTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TopicUpdateTransactionTest.java
@@ -55,7 +55,7 @@ public class TopicUpdateTransactionTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionIdTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionIdTest.java
index 3017a5017..17e212adf 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionIdTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionIdTest.java
@@ -34,7 +34,7 @@
 class TransactionIdTest {
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionReceiptQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionReceiptQueryTest.java
index dc128cb85..946b36c97 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionReceiptQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionReceiptQueryTest.java
@@ -35,7 +35,7 @@ public class TransactionReceiptQueryTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionReceiptTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionReceiptTest.java
index 97cc780b4..5e950a62f 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionReceiptTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionReceiptTest.java
@@ -19,7 +19,7 @@ public class TransactionReceiptTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionRecordQueryTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionRecordQueryTest.java
index f7d531e31..15590be19 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionRecordQueryTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionRecordQueryTest.java
@@ -35,7 +35,7 @@ public class TransactionRecordQueryTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionRecordTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionRecordTest.java
index 0616d408d..f68ed794f 100644
--- a/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionRecordTest.java
+++ b/sdk/src/test/java/com/hedera/hashgraph/sdk/TransactionRecordTest.java
@@ -44,7 +44,7 @@ public class TransactionRecordTest {
 
     @BeforeAll
     public static void beforeAll() {
-        SnapshotMatcher.start();
+        SnapshotMatcher.start(Snapshot::asJsonString);
     }
 
     @AfterAll