diff --git a/gnovm/pkg/gnolang/machine.go b/gnovm/pkg/gnolang/machine.go
index 15f8336dd22..75d12ac5402 100644
--- a/gnovm/pkg/gnolang/machine.go
+++ b/gnovm/pkg/gnolang/machine.go
@@ -2117,6 +2117,10 @@ func (m *Machine) Printf(format string, args ...interface{}) {
 }
 
 func (m *Machine) String() string {
+	if m == nil {
+		return "Machine:nil"
+	}
+
 	// Calculate some reasonable total length to avoid reallocation
 	// Assuming an average length of 32 characters per string
 	var (
diff --git a/gnovm/pkg/gnolang/machine_test.go b/gnovm/pkg/gnolang/machine_test.go
index c3b2118f099..c2ab8ea12c5 100644
--- a/gnovm/pkg/gnolang/machine_test.go
+++ b/gnovm/pkg/gnolang/machine_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/store/dbadapter"
 	"github.com/gnolang/gno/tm2/pkg/store/iavl"
 	stypes "github.com/gnolang/gno/tm2/pkg/store/types"
+	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -56,3 +57,61 @@ func TestRunMemPackageWithOverrides_revertToOld(t *testing.T) {
 	assert.Equal(t, StringKind, v.T.Kind())
 	assert.Equal(t, StringValue("1"), v.V)
 }
+
+func TestMachineString(t *testing.T) {
+	cases := []struct {
+		name string
+		in   *Machine
+		want string
+	}{
+		{
+			"nil Machine",
+			nil,
+			"Machine:nil",
+		},
+		{
+			"created with defaults",
+			NewMachineWithOptions(MachineOptions{}),
+			"Machine:\n    PreprocessorMode: false\n    Op: []\n    Values: (len: 0)\n    Exprs:\n    Stmts:\n    Blocks:\n    Blocks (other):\n    Frames:\n    Exceptions:\n",
+		},
+		{
+			"created with store and defaults",
+			func() *Machine {
+				db := memdb.NewMemDB()
+				baseStore := dbadapter.StoreConstructor(db, stypes.StoreOptions{})
+				iavlStore := iavl.StoreConstructor(db, stypes.StoreOptions{})
+				store := NewStore(nil, baseStore, iavlStore)
+				return NewMachine("std", store)
+			}(),
+			"Machine:\n    PreprocessorMode: false\n    Op: []\n    Values: (len: 0)\n    Exprs:\n    Stmts:\n    Blocks:\n    Blocks (other):\n    Frames:\n    Exceptions:\n",
+		},
+		{
+			"filled in",
+			func() *Machine {
+				db := memdb.NewMemDB()
+				baseStore := dbadapter.StoreConstructor(db, stypes.StoreOptions{})
+				iavlStore := iavl.StoreConstructor(db, stypes.StoreOptions{})
+				store := NewStore(nil, baseStore, iavlStore)
+				m := NewMachine("std", store)
+				m.PushOp(OpHalt)
+				m.PushExpr(&BasicLitExpr{
+					Kind:  INT,
+					Value: "100",
+				})
+				m.Blocks = make([]*Block, 1, 1)
+				m.PushStmts(S(Call(X("Redecl"), 11)))
+				return m
+			}(),
+			"Machine:\n    PreprocessorMode: false\n    Op: [OpHalt]\n    Values: (len: 0)\n    Exprs:\n          #0 100\n    Stmts:\n          #0 Redecl<VPUverse(0)>(11)\n    Blocks:\n    Blocks (other):\n    Frames:\n    Exceptions:\n",
+		},
+	}
+
+	for _, tt := range cases {
+		t.Run(tt.name, func(t *testing.T) {
+			got := tt.in.String()
+			if diff := cmp.Diff(got, tt.want); diff != "" {
+				t.Fatalf("Mismatch: got - want +\n%s", diff)
+			}
+		})
+	}
+}
diff --git a/go.mod b/go.mod
index 280ca3ae602..2d0d867d2c5 100644
--- a/go.mod
+++ b/go.mod
@@ -55,6 +55,7 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
diff --git a/tm2/pkg/bft/rpc/lib/server/write_endpoints_test.go b/tm2/pkg/bft/rpc/lib/server/write_endpoints_test.go
new file mode 100644
index 00000000000..5739c9eb8b1
--- /dev/null
+++ b/tm2/pkg/bft/rpc/lib/server/write_endpoints_test.go
@@ -0,0 +1,32 @@
+package rpcserver
+
+import (
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/assert"
+
+	types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types"
+)
+
+func TestWriteListOfEndpoints(t *testing.T) {
+	funcMap := map[string]*RPCFunc{
+		"c": NewWSRPCFunc(func(ctx *types.Context, s string, i int) (string, error) { return "foo", nil }, "s,i"),
+	}
+
+	req, _ := http.NewRequest("GET", "http://localhost/", nil)
+	rec := httptest.NewRecorder()
+	writeListOfEndpoints(rec, req, funcMap)
+	res := rec.Result()
+	assert.Equal(t, res.StatusCode, 200, "Should always return 200")
+	blob, err := io.ReadAll(res.Body)
+	assert.NoError(t, err)
+	gotResp := string(blob)
+	wantResp := `<html><body><br>Available endpoints:<br><br>Endpoints that require arguments:<br><a href="//localhost/c?s=_&i=_">//localhost/c?s=_&i=_</a></br></body></html>`
+	if diff := cmp.Diff(gotResp, wantResp); diff != "" {
+		t.Fatalf("Mismatch response: got - want +\n%s", diff)
+	}
+}