diff --git a/Cargo.lock b/Cargo.lock
index eddd7050..bf108ff7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6236,6 +6236,7 @@ dependencies = [
  "owo-colors",
  "paranoid-android",
  "parking_lot 0.12.1",
+ "paste",
  "range-set-blaze",
  "rkyv",
  "rtnetlink",
diff --git a/veilid-core/src/veilid_api/tests/test_serialize_json.rs b/veilid-core/src/veilid_api/tests/test_serialize_json.rs
index 78df9607..bf508779 100644
--- a/veilid-core/src/veilid_api/tests/test_serialize_json.rs
+++ b/veilid-core/src/veilid_api/tests/test_serialize_json.rs
@@ -17,10 +17,15 @@ pub async fn test_all() {
     test_transferstatsdownup().await;
     test_rpcstats().await;
     test_peerstats().await;
+    #[cfg(feature = "unstable-tunnels")]
     test_tunnelmode().await;
+    #[cfg(feature = "unstable-tunnels")]
     test_tunnelerror().await;
+    #[cfg(feature = "unstable-tunnels")]
     test_tunnelendpoint().await;
+    #[cfg(feature = "unstable-tunnels")]
     test_fulltunnel().await;
+    #[cfg(feature = "unstable-tunnels")]
     test_partialtunnel().await;
     test_veilidloglevel().await;
     test_veilidlog().await;
diff --git a/veilid-core/src/veilid_api/tests/test_types.rs b/veilid-core/src/veilid_api/tests/test_types.rs
index b56cc024..524f9f7a 100644
--- a/veilid-core/src/veilid_api/tests/test_types.rs
+++ b/veilid-core/src/veilid_api/tests/test_types.rs
@@ -26,7 +26,7 @@ pub async fn test_veilidappcall() {
     let orig = VeilidAppCall {
         sender: Some(fix_typedkey()),
         message: b"Well, hello!".to_vec(),
-        id: AlignedU64::from(123),
+        call_id: AlignedU64::from(123),
     };
     let copy = deserialize_json(&serialize_json(&orig)).unwrap();
 
@@ -116,12 +116,15 @@ pub async fn test_peerstats() {
 
 //  tunnel
 
+#[cfg(feature = "unstable-tunnels")]
 pub async fn test_tunnelmode() {
     let orig = TunnelMode::Raw;
     let copy = deserialize_json(&serialize_json(&orig)).unwrap();
 
     assert_eq!(orig, copy);
 }
+
+#[cfg(feature = "unstable-tunnels")]
 pub async fn test_tunnelerror() {
     let orig = TunnelError::NoCapacity;
     let copy = deserialize_json(&serialize_json(&orig)).unwrap();
@@ -129,6 +132,7 @@ pub async fn test_tunnelerror() {
     assert_eq!(orig, copy);
 }
 
+#[cfg(feature = "unstable-tunnels")]
 pub async fn test_tunnelendpoint() {
     let orig = TunnelEndpoint {
         mode: TunnelMode::Raw,
@@ -139,6 +143,7 @@ pub async fn test_tunnelendpoint() {
     assert_eq!(orig, copy);
 }
 
+#[cfg(feature = "unstable-tunnels")]
 pub async fn test_fulltunnel() {
     let orig = FullTunnel {
         id: AlignedU64::from(42),
@@ -157,6 +162,7 @@ pub async fn test_fulltunnel() {
     assert_eq!(orig, copy);
 }
 
+#[cfg(feature = "unstable-tunnels")]
 pub async fn test_partialtunnel() {
     let orig = PartialTunnel {
         id: AlignedU64::from(42),
diff --git a/veilid-core/src/veilid_api/tests/test_types_dht_schema.rs b/veilid-core/src/veilid_api/tests/test_types_dht_schema.rs
index a7a8379c..582d4040 100644
--- a/veilid-core/src/veilid_api/tests/test_types_dht_schema.rs
+++ b/veilid-core/src/veilid_api/tests/test_types_dht_schema.rs
@@ -1,6 +1,5 @@
 use super::fixtures::*;
 use crate::*;
-use range_set_blaze::*;
 
 // dlft