diff --git a/cln-grpc/Cargo.toml b/cln-grpc/Cargo.toml
index c0bccbe59..0d620dc0e 100644
--- a/cln-grpc/Cargo.toml
+++ b/cln-grpc/Cargo.toml
@@ -11,5 +11,8 @@ tonic = { version = "^0.5", features = ["tls", "transport"] }
 prost = "0.8"
 hex = "0.4.3"
 
+[dev-dependencies]
+serde_json = "1.0.72"
+
 [build-dependencies]
 tonic-build = "^0.5"
diff --git a/cln-grpc/src/pb.rs b/cln-grpc/src/pb.rs
index e37118614..cfec44b65 100644
--- a/cln-grpc/src/pb.rs
+++ b/cln-grpc/src/pb.rs
@@ -127,3 +127,225 @@ impl From<RoutehintList> for cln_rpc::primitives::RoutehintList {
         }
     }
 }
+#[cfg(test)]
+mod test {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn test_listpeers() {
+        let j: serde_json::Value = json!({
+          "peers": [
+            {
+              "id": "0266e4598d1d3c415f572a8488830b60f7e744ed9235eb0b1ba93283b315c03518",
+              "connected": true,
+              "netaddr": [
+                "127.0.0.1:39152"
+              ],
+              "features": "8808226aa2",
+              "channels": [
+                {
+                  "state": "CHANNELD_NORMAL",
+                  "scratch_txid": "fd4659658d235c20c81f96f7bc867c17abbfd20fcdd46c27eaad74ea52eaee90",
+                  "last_tx_fee_msat": "14257000msat",
+                  "feerate": {
+                    "perkw": 11000,
+                    "perkb": 44000
+                  },
+                  "owner": "channeld",
+                  "short_channel_id": "103x2x1",
+                  "direction": 0,
+                  "channel_id": "44b77a6d66ca54f0c365c84b13a95fbde462415a0549228baa25ee1bb1dfef66",
+                  "funding_txid": "67efdfb11bee25aa8b2249055a4162e4bd5fa9134bc865c3f054ca666d7ab744",
+                  "funding_outnum": 1,
+                  "close_to_addr": "bcrt1q9tc6q49l6wrrtp8ul45rj92hsleehwwxty32zu",
+                  "close_to": "00142af1a054bfd3863584fcfd6839155787f39bb9c6",
+                  "private": false,
+                  "opener": "remote",
+                  "features": [
+                    "option_static_remotekey",
+                    "option_anchor_outputs"
+                  ],
+                  "funding": {
+                    "local_msat": "0msat",
+                    "remote_msat": "1000000000msat",
+                    "pushed_msat": "0msat"
+                  },
+                  "msatoshi_to_us": 0,
+                  "to_us_msat": "0msat",
+                  "msatoshi_to_us_min": 0,
+                  "min_to_us_msat": "0msat",
+                  "msatoshi_to_us_max": 0,
+                  "max_to_us_msat": "0msat",
+                  "msatoshi_total": 1000000000,
+                  "total_msat": "1000000000msat",
+                  "fee_base_msat": "1msat",
+                  "fee_proportional_millionths": 10,
+                  "dust_limit_satoshis": 546,
+                  "dust_limit_msat": "546000msat",
+                  "max_total_htlc_in_msat": "18446744073709551615msat",
+                  "their_channel_reserve_satoshis": 10000,
+                  "their_reserve_msat": "10000000msat",
+                  "our_channel_reserve_satoshis": 10000,
+                  "our_reserve_msat": "10000000msat",
+                  "spendable_msatoshi": 0,
+                  "spendable_msat": "0msat",
+                  "receivable_msatoshi": 853257998,
+                  "receivable_msat": "853257998msat",
+                  "htlc_minimum_msat": 0,
+                  "minimum_htlc_in_msat": "0msat",
+                  "their_to_self_delay": 5,
+                  "our_to_self_delay": 5,
+                  "max_accepted_htlcs": 483,
+                  "state_changes": [
+                    {
+                      "timestamp": "2022-03-25T13:57:33.322Z",
+                      "old_state": "CHANNELD_AWAITING_LOCKIN",
+                      "new_state": "CHANNELD_NORMAL",
+                      "cause": "remote",
+                      "message": "Lockin complete"
+                    }
+                  ],
+                  "status": [
+                    "CHANNELD_NORMAL:Funding transaction locked. Channel announced."
+                  ],
+                  "in_payments_offered": 1,
+                  "in_msatoshi_offered": 100002002,
+                  "in_offered_msat": "100002002msat",
+                  "in_payments_fulfilled": 0,
+                  "in_msatoshi_fulfilled": 0,
+                  "in_fulfilled_msat": "0msat",
+                  "out_payments_offered": 0,
+                  "out_msatoshi_offered": 0,
+                  "out_offered_msat": "0msat",
+                  "out_payments_fulfilled": 0,
+                  "out_msatoshi_fulfilled": 0,
+                  "out_fulfilled_msat": "0msat",
+                  "htlcs": [
+                    {
+                      "direction": "in",
+                      "id": 0,
+                      "msatoshi": 100002002,
+                      "amount_msat": "100002002msat",
+                      "expiry": 131,
+                      "payment_hash": "d17a42c4f7f49648064a0ce7ce848bd92c4c50f24d35fe5c3d1f3a7a9bf474b2",
+                      "state": "RCVD_ADD_ACK_REVOCATION"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "035d2b1192dfba134e10e540875d366ebc8bc353d5aa766b80c090b39c3a5d885d",
+              "connected": true,
+              "netaddr": [
+                "127.0.0.1:38321"
+              ],
+              "features": "8808226aa2",
+              "channels": [
+                {
+                  "state": "CHANNELD_NORMAL",
+                  "scratch_txid": "30530d3f522862773100b7600d8ea8921a5ee84df17a2317326f9aa2c4829326",
+                  "last_tx_fee_msat": "16149000msat",
+                  "feerate": {
+                    "perkw": 11000,
+                    "perkb": 44000
+                  },
+                  "owner": "channeld",
+                  "short_channel_id": "103x1x0",
+                  "direction": 0,
+                  "channel_id": "006a2044fc72fa5c4a54c9fddbf208970a7b3b4fd2aaa70a96abba757c01769e",
+                  "funding_txid": "9e76017c75baab960aa7aad24f3b7b0a9708f2dbfdc9544a5cfa72fc44206a00",
+                  "funding_outnum": 0,
+                  "close_to_addr": "bcrt1qhfmyce4ujce2pyugew2435tlwft6p6w4s3py6d",
+                  "close_to": "0014ba764c66bc9632a09388cb9558d17f7257a0e9d5",
+                  "private": false,
+                  "opener": "local",
+                  "features": [
+                    "option_static_remotekey",
+                    "option_anchor_outputs"
+                  ],
+                  "funding": {
+                    "local_msat": "1000000000msat",
+                    "remote_msat": "0msat",
+                    "pushed_msat": "0msat"
+                  },
+                  "msatoshi_to_us": 1000000000,
+                  "to_us_msat": "1000000000msat",
+                  "msatoshi_to_us_min": 1000000000,
+                  "min_to_us_msat": "1000000000msat",
+                  "msatoshi_to_us_max": 1000000000,
+                  "max_to_us_msat": "1000000000msat",
+                  "msatoshi_total": 1000000000,
+                  "total_msat": "1000000000msat",
+                  "fee_base_msat": "1msat",
+                  "fee_proportional_millionths": 10,
+                  "dust_limit_satoshis": 546,
+                  "dust_limit_msat": "546000msat",
+                  "max_total_htlc_in_msat": "18446744073709551615msat",
+                  "their_channel_reserve_satoshis": 10000,
+                  "their_reserve_msat": "10000000msat",
+                  "our_channel_reserve_satoshis": 10000,
+                  "our_reserve_msat": "10000000msat",
+                  "spendable_msatoshi": 749473998,
+                  "spendable_msat": "749473998msat",
+                  "receivable_msatoshi": 0,
+                  "receivable_msat": "0msat",
+                  "htlc_minimum_msat": 0,
+                  "minimum_htlc_in_msat": "0msat",
+                  "their_to_self_delay": 5,
+                  "our_to_self_delay": 5,
+                  "max_accepted_htlcs": 483,
+                  "state_changes": [
+                    {
+                      "timestamp": "2022-03-25T13:57:33.325Z",
+                      "old_state": "CHANNELD_AWAITING_LOCKIN",
+                      "new_state": "CHANNELD_NORMAL",
+                      "cause": "user",
+                      "message": "Lockin complete"
+                    }
+                  ],
+                  "status": [
+                    "CHANNELD_NORMAL:Funding transaction locked. Channel announced."
+                  ],
+                  "in_payments_offered": 0,
+                  "in_msatoshi_offered": 0,
+                  "in_offered_msat": "0msat",
+                  "in_payments_fulfilled": 0,
+                  "in_msatoshi_fulfilled": 0,
+                  "in_fulfilled_msat": "0msat",
+                  "out_payments_offered": 2,
+                  "out_msatoshi_offered": 200002002,
+                  "out_offered_msat": "200002002msat",
+                  "out_payments_fulfilled": 0,
+                  "out_msatoshi_fulfilled": 0,
+                  "out_fulfilled_msat": "0msat",
+                  "htlcs": [
+                    {
+                      "direction": "out",
+                      "id": 1,
+                      "msatoshi": 100001001,
+                      "amount_msat": "100001001msat",
+                      "expiry": 125,
+                      "payment_hash": "d17a42c4f7f49648064a0ce7ce848bd92c4c50f24d35fe5c3d1f3a7a9bf474b2",
+                      "state": "SENT_ADD_ACK_REVOCATION"
+                    },
+                    {
+                      "direction": "out",
+                      "id": 0,
+                      "msatoshi": 100001001,
+                      "amount_msat": "100001001msat",
+                      "expiry": 124,
+                      "payment_hash": "d17a42c4f7f49648064a0ce7ce848bd92c4c50f24d35fe5c3d1f3a7a9bf474b2",
+                      "state": "SENT_ADD_ACK_REVOCATION"
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        });
+        let u: cln_rpc::model::ListpeersResponse = serde_json::from_value(j).unwrap();
+        let g: ListpeersResponse = (&u).into();
+    }
+}