diff --git a/Cargo.lock b/Cargo.lock
index d44ea8fd..f8abbefc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -227,21 +227,6 @@ version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -943,12 +928,6 @@ version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
-[[package]]
-name = "libm"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.7"
@@ -1049,7 +1028,7 @@ dependencies = [
 [[package]]
 name = "ndc-client"
 version = "0.1.0"
-source = "git+http://github.com/hasura/ndc-spec.git?tag=v0.1.0-rc.18#608ecc4b6719753c186a37494bbe95ae26e64f45"
+source = "git+http://github.com/hasura/ndc-spec.git?rev=0a7052750b705863419feadf2c80bd9a38a64923#0a7052750b705863419feadf2c80bd9a38a64923"
 dependencies = [
  "async-trait",
  "indexmap 2.1.0",
@@ -1102,14 +1081,14 @@ dependencies = [
 [[package]]
 name = "ndc-test"
 version = "0.1.0"
-source = "git+http://github.com/hasura/ndc-spec.git?tag=v0.1.0-rc.18#608ecc4b6719753c186a37494bbe95ae26e64f45"
+source = "git+http://github.com/hasura/ndc-spec.git?rev=0a7052750b705863419feadf2c80bd9a38a64923#0a7052750b705863419feadf2c80bd9a38a64923"
 dependencies = [
  "async-trait",
  "clap",
  "colored",
  "indexmap 2.1.0",
  "ndc-client",
- "proptest",
+ "rand",
  "reqwest",
  "semver",
  "serde",
@@ -1135,7 +1114,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
 dependencies = [
  "autocfg",
- "libm",
 ]
 
 [[package]]
@@ -1434,26 +1412,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "proptest"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e"
-dependencies = [
- "bit-set",
- "bit-vec",
- "bitflags 2.4.1",
- "lazy_static",
- "num-traits",
- "rand",
- "rand_chacha",
- "rand_xorshift",
- "regex-syntax 0.7.5",
- "rusty-fork",
- "tempfile",
- "unarray",
-]
-
 [[package]]
 name = "prost"
 version = "0.11.9"
@@ -1483,12 +1441,6 @@ version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
 [[package]]
 name = "quote"
 version = "1.0.33"
@@ -1528,15 +1480,6 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "rand_xorshift"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
-dependencies = [
- "rand_core",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.3.5"
@@ -1656,18 +1599,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
-[[package]]
-name = "rusty-fork"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
-dependencies = [
- "fnv",
- "quick-error",
- "tempfile",
- "wait-timeout",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -2368,12 +2299,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
-[[package]]
-name = "unarray"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
-
 [[package]]
 name = "unicase"
 version = "2.7.0"
@@ -2451,15 +2376,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "wait-timeout"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "want"
 version = "0.3.1"
diff --git a/rust-connector-sdk/Cargo.toml b/rust-connector-sdk/Cargo.toml
index 9d74a70c..3defa026 100644
--- a/rust-connector-sdk/Cargo.toml
+++ b/rust-connector-sdk/Cargo.toml
@@ -13,8 +13,8 @@ path = "bin/main.rs"
 
 [dependencies]
 gdc_rust_types = { git = "https://github.com/hasura/gdc_rust_types.git", rev = "3273434" }
-ndc-client = { git = "http://github.com/hasura/ndc-spec.git", tag = "v0.1.0-rc.18" }
-ndc-test = { git = "http://github.com/hasura/ndc-spec.git", tag = "v0.1.0-rc.18" }
+ndc-client = { git = "http://github.com/hasura/ndc-spec.git", rev = "0a7052750b705863419feadf2c80bd9a38a64923" }
+ndc-test = { git = "http://github.com/hasura/ndc-spec.git", rev = "0a7052750b705863419feadf2c80bd9a38a64923" }
 
 async-trait = "^0.1.74"
 axum = "^0.6.20"
diff --git a/rust-connector-sdk/src/default_main.rs b/rust-connector-sdk/src/default_main.rs
index 25cd644d..2312559d 100644
--- a/rust-connector-sdk/src/default_main.rs
+++ b/rust-connector-sdk/src/default_main.rs
@@ -16,6 +16,7 @@ use axum::{
 };
 use axum_extra::extract::WithRejection;
 use clap::{Parser, Subcommand};
+use ndc_test::reporter::{ConsoleReporter, TestResults};
 use prometheus::Registry;
 use tower_http::{trace::TraceLayer, validate_request::ValidateRequestHeaderLayer};
 
@@ -23,7 +24,6 @@ use ndc_client::models::{
     CapabilitiesResponse, ErrorResponse, ExplainResponse, MutationRequest, MutationResponse,
     QueryRequest, QueryResponse, SchemaResponse,
 };
-use ndc_test::report;
 
 use crate::check_health;
 use crate::connector::{Connector, ConnectorSetup};
@@ -480,49 +480,49 @@ struct ConnectorAdapter<C: Connector> {
     state: C::State,
 }
 
-#[async_trait]
-impl<C: Connector> ndc_test::Connector for ConnectorAdapter<C> {
+#[async_trait(?Send)]
+impl<C: Connector> ndc_test::connector::Connector for ConnectorAdapter<C> {
     async fn get_capabilities(
         &self,
-    ) -> Result<ndc_client::models::CapabilitiesResponse, ndc_test::Error> {
+    ) -> Result<ndc_client::models::CapabilitiesResponse, ndc_test::error::Error> {
         C::get_capabilities()
             .await
             .into_value::<Box<dyn std::error::Error + Send + Sync>>()
-            .map_err(|err| ndc_test::Error::OtherError(err))
+            .map_err(|err| ndc_test::error::Error::OtherError(err))
     }
 
-    async fn get_schema(&self) -> Result<ndc_client::models::SchemaResponse, ndc_test::Error> {
+    async fn get_schema(&self) -> Result<ndc_client::models::SchemaResponse, ndc_test::error::Error> {
         match C::get_schema(&self.configuration).await {
             Ok(response) => response
                 .into_value::<Box<dyn std::error::Error + Send + Sync>>()
-                .map_err(|err| ndc_test::Error::OtherError(err)),
-            Err(err) => Err(ndc_test::Error::OtherError(err.into())),
+                .map_err(|err| ndc_test::error::Error::OtherError(err)),
+            Err(err) => Err(ndc_test::error::Error::OtherError(err.into())),
         }
     }
 
     async fn query(
         &self,
         request: ndc_client::models::QueryRequest,
-    ) -> Result<ndc_client::models::QueryResponse, ndc_test::Error> {
+    ) -> Result<ndc_client::models::QueryResponse, ndc_test::error::Error> {
         match C::query(&self.configuration, &self.state, request)
             .await
             .and_then(JsonResponse::into_value)
         {
             Ok(response) => Ok(response),
-            Err(err) => Err(ndc_test::Error::OtherError(err.into())),
+            Err(err) => Err(ndc_test::error::Error::OtherError(err.into())),
         }
     }
 
     async fn mutation(
         &self,
         request: ndc_client::models::MutationRequest,
-    ) -> Result<ndc_client::models::MutationResponse, ndc_test::Error> {
+    ) -> Result<ndc_client::models::MutationResponse, ndc_test::error::Error> {
         match C::mutation(&self.configuration, &self.state, request)
             .await
             .and_then(JsonResponse::into_value)
         {
             Ok(response) => Ok(response),
-            Err(err) => Err(ndc_test::Error::OtherError(err.into())),
+            Err(err) => Err(ndc_test::error::Error::OtherError(err.into())),
         }
     }
 }
@@ -531,17 +531,20 @@ async fn test<Setup: ConnectorSetup>(
     setup: Setup,
     command: TestCommand,
 ) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let test_configuration = ndc_test::TestConfiguration {
-        seed: command.seed,
+    let test_configuration = ndc_test::configuration::TestConfiguration {
+        seed: command.seed.map(|s| s.as_bytes().try_into()).transpose()?,
         snapshots_dir: command.snapshots_dir,
+        gen_config: ndc_test::configuration::TestGenerationConfiguration::default(),
     };
 
     let connector = make_connector_adapter(setup, command.configuration).await?;
-    let results = ndc_test::test_connector(&test_configuration, &connector).await;
+    let mut reporter = (ConsoleReporter::new(), TestResults::default());
 
-    if !results.failures.is_empty() {
-        println!();
-        println!("{}", report(results));
+    ndc_test::test_connector(&test_configuration, &connector, &mut reporter).await;
+
+    if !reporter.1.failures.is_empty() {
+        // println!();
+        // println!("{}", report(reporter.1));
 
         exit(1)
     }
@@ -554,11 +557,13 @@ async fn replay<Setup: ConnectorSetup>(
     command: ReplayCommand,
 ) -> Result<(), Box<dyn Error + Send + Sync>> {
     let connector = make_connector_adapter(setup, command.configuration).await?;
-    let results = ndc_test::test_snapshots_in_directory(&connector, command.snapshots_dir).await;
+    let mut reporter = (ConsoleReporter::new(), TestResults::default());
+
+    ndc_test::test_snapshots_in_directory(&connector, &mut reporter, command.snapshots_dir).await;
 
-    if !results.failures.is_empty() {
-        println!();
-        println!("{}", report(results));
+    if !reporter.1.failures.is_empty() {
+        // println!();
+        // println!("{}", report(reporter.1));
 
         exit(1)
     }