diff --git a/model/ledger/account_root_test.go b/model/ledger/account_root_test.go
index 9c8132d8..9e45bcf8 100644
--- a/model/ledger/account_root_test.go
+++ b/model/ledger/account_root_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestAccountRoot(t *testing.T) {
-	var s LedgerObject
-	s = &AccountRoot{
+	var s LedgerObject = &AccountRoot{
 		Account:           "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
 		AccountTxnID:      "0D5FB50FA65C9FE1538FD7E398FFFE9D1908DFA4576D8D7A020040686F93C77D",
 		Balance:           types.XRPCurrencyAmount(148446663),
diff --git a/model/ledger/amendments_test.go b/model/ledger/amendments_test.go
index 9996a9b1..9cb0d411 100644
--- a/model/ledger/amendments_test.go
+++ b/model/ledger/amendments_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestAmmendments(t *testing.T) {
-	var s LedgerObject
-	s = &Amendments{
+	var s LedgerObject = &Amendments{
 		Amendments: []types.Hash256{
 			"42426C4D4F1009EE67080A9B7965B44656D7714D104A72F9B4369F97ABF044EE",
 			"4C97EBA926031A7CF7D7B36FDE3ED66DDA5421192D63DE53FFB46E43B9DC8373",
diff --git a/model/ledger/check_test.go b/model/ledger/check_test.go
index 1fa11a5d..d172a2be 100644
--- a/model/ledger/check_test.go
+++ b/model/ledger/check_test.go
@@ -7,8 +7,7 @@ import (
 )
 
 func TestCheck(t *testing.T) {
-	var s LedgerObject
-	s = &Check{
+	var s LedgerObject = &Check{
 		Account:           "rUn84CUYbNjRoTQ6mSW7BVJPSVJNLb1QLo",
 		Destination:       "rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy",
 		DestinationNode:   "0000000000000000",
diff --git a/model/ledger/deposit_preauth_test.go b/model/ledger/deposit_preauth_test.go
index 71fd2a5d..987341ec 100644
--- a/model/ledger/deposit_preauth_test.go
+++ b/model/ledger/deposit_preauth_test.go
@@ -7,8 +7,7 @@ import (
 )
 
 func TestDepositPreauth(t *testing.T) {
-	var s LedgerObject
-	s = &DepositPreauthObj{
+	var s LedgerObject = &DepositPreauthObj{
 		LedgerEntryType:   DepositPreauthObjEntry,
 		Account:           "rsUiUMpnrgxQp24dJYZDhmV4bE3aBtQyt8",
 		Authorize:         "rEhxGqkqPPSxQ3P25J66ft5TwpzV14k2de",
diff --git a/model/ledger/directory_node_test.go b/model/ledger/directory_node_test.go
index 89cb22f4..056af295 100644
--- a/model/ledger/directory_node_test.go
+++ b/model/ledger/directory_node_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestOfferDirectoryNode(t *testing.T) {
-	var s LedgerObject
-	s = &DirectoryNode{
+	var s LedgerObject = &DirectoryNode{
 		Flags: 0,
 		Indexes: []types.Hash256{
 			"AD7EAE148287EF12D213A251015F86E6D4BD34B3C4A0A1ED9A17198373F908AD",
@@ -41,8 +40,7 @@ func TestOfferDirectoryNode(t *testing.T) {
 }
 
 func TestOwnerDirectoryNode(t *testing.T) {
-	var s LedgerObject
-	s = &DirectoryNode{
+	var s LedgerObject = &DirectoryNode{
 		Flags: 0,
 		Indexes: []types.Hash256{
 			"AD7EAE148287EF12D213A251015F86E6D4BD34B3C4A0A1ED9A17198373F908AD",
diff --git a/model/ledger/escrow_test.go b/model/ledger/escrow_test.go
index a52f7e2f..77d2395f 100644
--- a/model/ledger/escrow_test.go
+++ b/model/ledger/escrow_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestEscrow(t *testing.T) {
-	var s LedgerObject
-	s = &Escrow{
+	var s LedgerObject = &Escrow{
 		Account:           "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
 		Amount:            types.XRPCurrencyAmount(10000),
 		CancelAfter:       545440232,
diff --git a/model/ledger/fee_settings_test.go b/model/ledger/fee_settings_test.go
index bcb63938..923bc03c 100644
--- a/model/ledger/fee_settings_test.go
+++ b/model/ledger/fee_settings_test.go
@@ -7,8 +7,7 @@ import (
 )
 
 func TestFeeSettings(t *testing.T) {
-	var s LedgerObject
-	s = &FeeSettings{
+	var s LedgerObject = &FeeSettings{
 		BaseFee:           "000000000000000A",
 		Flags:             0,
 		LedgerEntryType:   FeeSettingsEntry,
diff --git a/model/ledger/ledger_hashes_test.go b/model/ledger/ledger_hashes_test.go
index 6ca7d466..bcdcc08c 100644
--- a/model/ledger/ledger_hashes_test.go
+++ b/model/ledger/ledger_hashes_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestLedgerHashes(t *testing.T) {
-	var s LedgerObject
-	s = &LedgerHashes{
+	var s LedgerObject = &LedgerHashes{
 		FirstLedgerSequence: 2,
 		Flags:               0,
 		Hashes: []types.Hash256{
diff --git a/model/ledger/negative_unl_test.go b/model/ledger/negative_unl_test.go
index a208ed37..3c9bed72 100644
--- a/model/ledger/negative_unl_test.go
+++ b/model/ledger/negative_unl_test.go
@@ -7,8 +7,7 @@ import (
 )
 
 func TestNegativeUNL(t *testing.T) {
-	var s LedgerObject
-	s = &NegativeUNL{
+	var s LedgerObject = &NegativeUNL{
 		DisabledValidators: []DisabledValidatorEntry{
 			{
 				DisabledValidator: DisabledValidator{
diff --git a/model/ledger/nftoken_offer_test.go b/model/ledger/nftoken_offer_test.go
index ed74e1af..03d1ec15 100644
--- a/model/ledger/nftoken_offer_test.go
+++ b/model/ledger/nftoken_offer_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestNFTokenOffer(t *testing.T) {
-	var s LedgerObject
-	s = &NFTokenOffer{
+	var s LedgerObject = &NFTokenOffer{
 		Amount:            types.XRPCurrencyAmount(1000000),
 		Flags:             1,
 		LedgerEntryType:   NFTokenOfferEntry,
diff --git a/model/ledger/nftoken_page_test.go b/model/ledger/nftoken_page_test.go
index 29bef0c8..1da49725 100644
--- a/model/ledger/nftoken_page_test.go
+++ b/model/ledger/nftoken_page_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestNFTokenPage(t *testing.T) {
-	var s LedgerObject
-	s = &NFTokenPage{
+	var s LedgerObject = &NFTokenPage{
 		LedgerEntryType:   NFTokenPageEntry,
 		PreviousTxnID:     "95C8761B22894E328646F7A70035E9DFBECC90EDD83E43B7B973F626D21A0822",
 		PreviousTxnLgrSeq: 42891441,
diff --git a/model/ledger/offer_test.go b/model/ledger/offer_test.go
index 42de1970..65f4ef6f 100644
--- a/model/ledger/offer_test.go
+++ b/model/ledger/offer_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestOffer(t *testing.T) {
-	var s LedgerObject
-	s = &Offer{
+	var s LedgerObject = &Offer{
 		Account:           "rBqb89MRQJnMPq8wTwEbtz4kvxrEDfcYvt",
 		BookDirectory:     "ACC27DE91DBA86FC509069EAF4BC511D73128B780F2E54BF5E07A369E2446000",
 		BookNode:          "0000000000000000",
diff --git a/model/ledger/pay_channel_test.go b/model/ledger/pay_channel_test.go
index 5dab1288..ea907200 100644
--- a/model/ledger/pay_channel_test.go
+++ b/model/ledger/pay_channel_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestPayChannel(t *testing.T) {
-	var s LedgerObject
-	s = &PayChannel{
+	var s LedgerObject = &PayChannel{
 		Account:           "rBqb89MRQJnMPq8wTwEbtz4kvxrEDfcYvt",
 		Destination:       "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
 		Amount:            types.XRPCurrencyAmount(4325800),
diff --git a/model/ledger/ripple_state_test.go b/model/ledger/ripple_state_test.go
index f4db801d..509b01f4 100644
--- a/model/ledger/ripple_state_test.go
+++ b/model/ledger/ripple_state_test.go
@@ -8,8 +8,7 @@ import (
 )
 
 func TestRippleState(t *testing.T) {
-	var s LedgerObject
-	s = &RippleState{
+	var s LedgerObject = &RippleState{
 		Balance: types.IssuedCurrencyAmount{
 			Currency: "USD",
 			Issuer:   "rrrrrrrrrrrrrrrrrrrrBZbvji",
diff --git a/model/ledger/signer_list_test.go b/model/ledger/signer_list_test.go
index 282c057f..04bb3ab5 100644
--- a/model/ledger/signer_list_test.go
+++ b/model/ledger/signer_list_test.go
@@ -7,8 +7,7 @@ import (
 )
 
 func TestSignerList(t *testing.T) {
-	var s LedgerObject
-	s = &SignerList{
+	var s LedgerObject = &SignerList{
 		Flags:             0,
 		LedgerEntryType:   SignerListEntry,
 		OwnerNode:         "0000000000000000",
diff --git a/model/ledger/ticket_test.go b/model/ledger/ticket_test.go
index 6bdc9ff2..adb6dfc1 100644
--- a/model/ledger/ticket_test.go
+++ b/model/ledger/ticket_test.go
@@ -7,8 +7,7 @@ import (
 )
 
 func TestTicket(t *testing.T) {
-	var s LedgerObject
-	s = &Ticket{
+	var s LedgerObject = &Ticket{
 		Account:           "rEhxGqkqPPSxQ3P25J66ft5TwpzV14k2de",
 		Flags:             0,
 		LedgerEntryType:   TicketEntry,