diff --git a/go.mod b/go.mod
index a93b60d0..2243d5be 100644
--- a/go.mod
+++ b/go.mod
@@ -18,9 +18,9 @@ require (
 	github.com/dfuse-io/binary v0.0.0-20210216024852-4ae6830a495d
 	github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70
 	github.com/fatih/color v1.7.0
+	github.com/gagliardetto/gofuzz v1.2.2
 	github.com/gagliardetto/treeout v0.1.2
 	github.com/google/go-cmp v0.5.1
-	github.com/google/gofuzz v1.0.0
 	github.com/gorilla/rpc v1.2.0
 	github.com/gorilla/websocket v1.4.2
 	github.com/json-iterator/go v1.1.11
@@ -51,5 +51,3 @@ require (
 )
 
 replace github.com/dfuse-io/binary => github.com/gagliardetto/binary v0.4.0
-
-replace github.com/google/gofuzz => github.com/gagliardetto/gofuzz v1.2.1
diff --git a/go.sum b/go.sum
index 803f1ae7..2e0a9587 100644
--- a/go.sum
+++ b/go.sum
@@ -91,8 +91,8 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gagliardetto/binary v0.4.0 h1:dxLndYArHtdZYbLYwnpLY86mlAa9gWgxG2zSDPFINjM=
 github.com/gagliardetto/binary v0.4.0/go.mod h1:55fxN6CKhVnsBhSr3Hmyn7i2igseIzN9/NC+gHvv42k=
-github.com/gagliardetto/gofuzz v1.2.1 h1:fHBiDgCYYb8kBRqyI+bhU59/IKATHArFUAY3iVUrdPA=
-github.com/gagliardetto/gofuzz v1.2.1/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gagliardetto/gofuzz v1.2.2 h1:XL/8qDMzcgvR4+CyRQW9UGdwPRPMHVJfqQ/uMvSUuQw=
+github.com/gagliardetto/gofuzz v1.2.2/go.mod h1:bkH/3hYLZrMLbfYWA0pWzXmi5TTRZnu4pMGZBkqMKvY=
 github.com/gagliardetto/treeout v0.1.2 h1:WXO7LDJTwINO37OQfNlf7s095Z1bAiwN2ACaZQic33Q=
 github.com/gagliardetto/treeout v0.1.2/go.mod h1:loUefvXTrlRG5rYmJmExNryyBRh8f89VZhmMOyCyqok=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -138,6 +138,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
diff --git a/programs/system/AdvanceNonceAccount_test.go b/programs/system/AdvanceNonceAccount_test.go
index 516ffd29..869f066f 100644
--- a/programs/system/AdvanceNonceAccount_test.go
+++ b/programs/system/AdvanceNonceAccount_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_AdvanceNonceAccount(t *testing.T) {
diff --git a/programs/system/AllocateWithSeed_test.go b/programs/system/AllocateWithSeed_test.go
index 86ed2561..5d9ce7f6 100644
--- a/programs/system/AllocateWithSeed_test.go
+++ b/programs/system/AllocateWithSeed_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_AllocateWithSeed(t *testing.T) {
diff --git a/programs/system/Allocate_test.go b/programs/system/Allocate_test.go
index 33f0a4e2..26ac2942 100644
--- a/programs/system/Allocate_test.go
+++ b/programs/system/Allocate_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_Allocate(t *testing.T) {
diff --git a/programs/system/AssignWithSeed_test.go b/programs/system/AssignWithSeed_test.go
index a1272d68..5bbe3995 100644
--- a/programs/system/AssignWithSeed_test.go
+++ b/programs/system/AssignWithSeed_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_AssignWithSeed(t *testing.T) {
diff --git a/programs/system/Assign_test.go b/programs/system/Assign_test.go
index 1b264c59..1c37f827 100644
--- a/programs/system/Assign_test.go
+++ b/programs/system/Assign_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_Assign(t *testing.T) {
diff --git a/programs/system/AuthorizeNonceAccount_test.go b/programs/system/AuthorizeNonceAccount_test.go
index 30379b37..9c8b01d5 100644
--- a/programs/system/AuthorizeNonceAccount_test.go
+++ b/programs/system/AuthorizeNonceAccount_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_AuthorizeNonceAccount(t *testing.T) {
diff --git a/programs/system/CreateAccountWithSeed_test.go b/programs/system/CreateAccountWithSeed_test.go
index aa2ac740..df8b614e 100644
--- a/programs/system/CreateAccountWithSeed_test.go
+++ b/programs/system/CreateAccountWithSeed_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_CreateAccountWithSeed(t *testing.T) {
diff --git a/programs/system/CreateAccount_test.go b/programs/system/CreateAccount_test.go
index fdda187a..8df6b95b 100644
--- a/programs/system/CreateAccount_test.go
+++ b/programs/system/CreateAccount_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_CreateAccount(t *testing.T) {
diff --git a/programs/system/InitializeNonceAccount_test.go b/programs/system/InitializeNonceAccount_test.go
index 89d835c5..aa101835 100644
--- a/programs/system/InitializeNonceAccount_test.go
+++ b/programs/system/InitializeNonceAccount_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_InitializeNonceAccount(t *testing.T) {
diff --git a/programs/system/TransferWithSeed_test.go b/programs/system/TransferWithSeed_test.go
index da7f96dc..7ac2ed38 100644
--- a/programs/system/TransferWithSeed_test.go
+++ b/programs/system/TransferWithSeed_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_TransferWithSeed(t *testing.T) {
diff --git a/programs/system/Transfer_test.go b/programs/system/Transfer_test.go
index 3ae89055..7526cc3f 100644
--- a/programs/system/Transfer_test.go
+++ b/programs/system/Transfer_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_Transfer(t *testing.T) {
diff --git a/programs/system/WithdrawNonceAccount_test.go b/programs/system/WithdrawNonceAccount_test.go
index 0ec4aac9..de84e109 100644
--- a/programs/system/WithdrawNonceAccount_test.go
+++ b/programs/system/WithdrawNonceAccount_test.go
@@ -2,10 +2,11 @@ package system
 
 import (
 	"bytes"
-	ag_gofuzz "github.com/google/gofuzz"
-	ag_require "github.com/stretchr/testify/require"
 	"strconv"
 	"testing"
+
+	ag_gofuzz "github.com/gagliardetto/gofuzz"
+	ag_require "github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode_WithdrawNonceAccount(t *testing.T) {