diff --git a/github/actions_cache_test.go b/github/actions_cache_test.go
index 4831b612c4a..53cfe339961 100644
--- a/github/actions_cache_test.go
+++ b/github/actions_cache_test.go
@@ -545,7 +545,7 @@ func TestActionsCache_Marshal(t *testing.T) {
 
 func TestActionsCacheList_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ActionsCacheList{}, "{}")
+	testJSONMarshal(t, &ActionsCacheList{}, `{"total_count": 0}`)
 
 	u := &ActionsCacheList{
 		TotalCount: 2,
@@ -590,7 +590,11 @@ func TestActionsCacheList_Marshal(t *testing.T) {
 
 func TestActionsCacheUsage_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ActionsCacheUsage{}, "{}")
+	testJSONMarshal(t, &ActionsCacheUsage{}, `{
+		"active_caches_count": 0,
+		"active_caches_size_in_bytes": 0,
+		"full_name": ""
+	}`)
 
 	u := &ActionsCacheUsage{
 		FullName:                "cache_usage1",
@@ -609,7 +613,7 @@ func TestActionsCacheUsage_Marshal(t *testing.T) {
 
 func TestActionsCacheUsageList_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ActionsCacheUsageList{}, "{}")
+	testJSONMarshal(t, &ActionsCacheUsageList{}, `{"total_count": 0}`)
 
 	u := &ActionsCacheUsageList{
 		TotalCount: 1,
@@ -636,7 +640,10 @@ func TestActionsCacheUsageList_Marshal(t *testing.T) {
 
 func TestTotalCacheUsage_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &TotalCacheUsage{}, "{}")
+	testJSONMarshal(t, &TotalCacheUsage{}, `{
+		"total_active_caches_count": 0,
+		"total_active_caches_size_in_bytes": 0
+	}`)
 
 	u := &TotalCacheUsage{
 		TotalActiveCachesUsageSizeInBytes: 2,
diff --git a/github/actions_runner_groups_test.go b/github/actions_runner_groups_test.go
index c7154b74e0a..34a6ee68cce 100644
--- a/github/actions_runner_groups_test.go
+++ b/github/actions_runner_groups_test.go
@@ -557,8 +557,7 @@ func TestRunnerGroup_Marshal(t *testing.T) {
 		"runners_url": "r",
 		"inherited": true,
 		"allows_public_repositories": true,
-		"restricted_to_workflows": false,
-		"selected_workflows": []
+		"restricted_to_workflows": false
 	}`
 
 	testJSONMarshal(t, u, want)
@@ -566,7 +565,7 @@ func TestRunnerGroup_Marshal(t *testing.T) {
 
 func TestRunnerGroups_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &RunnerGroups{}, "{}")
+	testJSONMarshal(t, &RunnerGroups{}, `{"runner_groups": null, "total_count": 0}`)
 
 	u := &RunnerGroups{
 		TotalCount: int(1),
@@ -597,8 +596,7 @@ func TestRunnerGroups_Marshal(t *testing.T) {
 			"runners_url": "r",
 			"inherited": true,
 			"allows_public_repositories": true,
-			"restricted_to_workflows": false,
-			"selected_workflows": []
+			"restricted_to_workflows": false
 		}]
 	}`
 
@@ -648,8 +646,7 @@ func TestUpdateRunnerGroupRequest_Marshal(t *testing.T) {
 		"name": "n",
 		"visibility": "v",
 		"allows_public_repositories": true,
-		"restricted_to_workflows": false,
-		"selected_workflows": []
+		"restricted_to_workflows": false
 	}`
 
 	testJSONMarshal(t, u, want)
@@ -657,7 +654,7 @@ func TestUpdateRunnerGroupRequest_Marshal(t *testing.T) {
 
 func TestSetRepoAccessRunnerGroupRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &SetRepoAccessRunnerGroupRequest{}, "{}")
+	testJSONMarshal(t, &SetRepoAccessRunnerGroupRequest{}, `{"selected_repository_ids": null}`)
 
 	u := &SetRepoAccessRunnerGroupRequest{
 		SelectedRepositoryIDs: []int64{1},
@@ -672,7 +669,7 @@ func TestSetRepoAccessRunnerGroupRequest_Marshal(t *testing.T) {
 
 func TestSetRunnerGroupRunnersRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &SetRunnerGroupRunnersRequest{}, "{}")
+	testJSONMarshal(t, &SetRunnerGroupRunnersRequest{}, `{"runners": null}`)
 
 	u := &SetRunnerGroupRunnersRequest{
 		Runners: []int64{1},
diff --git a/github/actions_runners_test.go b/github/actions_runners_test.go
index 4c174d3c878..2f36c905abf 100644
--- a/github/actions_runners_test.go
+++ b/github/actions_runners_test.go
@@ -577,7 +577,10 @@ func TestRunnerApplicationDownload_Marshal(t *testing.T) {
 
 func TestActionsEnabledOnOrgRepos_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ActionsEnabledOnOrgRepos{}, "{}")
+	testJSONMarshal(t, &ActionsEnabledOnOrgRepos{}, `{
+		"repositories": null,
+		"total_count": 0
+	}`)
 
 	u := &ActionsEnabledOnOrgRepos{
 		TotalCount: 1,
@@ -679,7 +682,7 @@ func TestRunner_Marshal(t *testing.T) {
 
 func TestRunners_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &Runners{}, "{}")
+	testJSONMarshal(t, &Runners{}, `{"runners": null, "total_count": 0}`)
 
 	u := &Runners{
 		TotalCount: 1,
diff --git a/github/actions_secrets_test.go b/github/actions_secrets_test.go
index ebf312f8170..f3b601560f1 100644
--- a/github/actions_secrets_test.go
+++ b/github/actions_secrets_test.go
@@ -859,7 +859,10 @@ func TestActionsService_DeleteEnvSecret(t *testing.T) {
 
 func TestPublicKey_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &PublicKey{}, "{}")
+	testJSONMarshal(t, &PublicKey{}, `{
+		"key": null,
+		"key_id": null
+	}`)
 
 	u := &PublicKey{
 		KeyID: Ptr("kid"),
@@ -876,7 +879,11 @@ func TestPublicKey_Marshal(t *testing.T) {
 
 func TestSecret_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &Secret{}, "{}")
+	testJSONMarshal(t, &Secret{}, `{
+		"created_at": `+emptyTimeStr+`,
+		"name": "",
+		"updated_at": `+emptyTimeStr+`
+	}`)
 
 	u := &Secret{
 		Name:                    "n",
@@ -899,7 +906,7 @@ func TestSecret_Marshal(t *testing.T) {
 
 func TestSecrets_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &Secrets{}, "{}")
+	testJSONMarshal(t, &Secrets{}, `{"secrets": null, "total_count": 0}`)
 
 	u := &Secrets{
 		TotalCount: 1,
@@ -931,7 +938,7 @@ func TestSecrets_Marshal(t *testing.T) {
 
 func TestEncryptedSecret_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &EncryptedSecret{}, "{}")
+	testJSONMarshal(t, &EncryptedSecret{}, `{"encrypted_value": "", "key_id": ""}`)
 
 	u := &EncryptedSecret{
 		Name:                  "n",
diff --git a/github/actions_variables_test.go b/github/actions_variables_test.go
index 5a1813ab73d..28b4556117c 100644
--- a/github/actions_variables_test.go
+++ b/github/actions_variables_test.go
@@ -703,7 +703,7 @@ func TestActionsService_DeleteEnvVariable(t *testing.T) {
 
 func TestActionVariable_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ActionsVariable{}, "{}")
+	testJSONMarshal(t, &ActionsVariable{}, `{"name": "", "value": ""}`)
 
 	av := &ActionsVariable{
 		Name:                    "n",
diff --git a/github/actions_workflow_runs_test.go b/github/actions_workflow_runs_test.go
index be400c27e8d..fdfea9a9a8a 100644
--- a/github/actions_workflow_runs_test.go
+++ b/github/actions_workflow_runs_test.go
@@ -897,7 +897,11 @@ func TestActionsService_ReviewCustomDeploymentProtectionRule(t *testing.T) {
 
 func TestReviewCustomDeploymentProtectionRuleRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ReviewCustomDeploymentProtectionRuleRequest{}, "{}")
+	testJSONMarshal(t, &ReviewCustomDeploymentProtectionRuleRequest{}, `{
+		"comment": "",
+		"environment_name": "",
+		"state": ""
+	}`)
 
 	r := &ReviewCustomDeploymentProtectionRuleRequest{
 		EnvironmentName: "e",
diff --git a/github/actions_workflows_test.go b/github/actions_workflows_test.go
index baaae7bfb9d..a4a766042e4 100644
--- a/github/actions_workflows_test.go
+++ b/github/actions_workflows_test.go
@@ -616,7 +616,7 @@ func TestWorkflowUsage_Marshal(t *testing.T) {
 
 func TestCreateWorkflowDispatchEventRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &CreateWorkflowDispatchEventRequest{}, "{}")
+	testJSONMarshal(t, &CreateWorkflowDispatchEventRequest{}, `{"ref": ""}`)
 
 	inputs := make(map[string]interface{}, 0)
 	inputs["key"] = "value"
diff --git a/github/activity_notifications_test.go b/github/activity_notifications_test.go
index 6f3ae5b970e..a0bb7150898 100644
--- a/github/activity_notifications_test.go
+++ b/github/activity_notifications_test.go
@@ -409,7 +409,7 @@ func TestNotificationSubject_Marshal(t *testing.T) {
 
 func TestMarkReadOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &markReadOptions{}, "{}")
+	testJSONMarshal(t, &markReadOptions{}, `{"last_read_at": `+emptyTimeStr+`}`)
 
 	u := &markReadOptions{
 		LastReadAt: Timestamp{referenceTime},
diff --git a/github/admin_users_test.go b/github/admin_users_test.go
index 4806c53461e..c51796b8a22 100644
--- a/github/admin_users_test.go
+++ b/github/admin_users_test.go
@@ -186,7 +186,7 @@ func TestUserImpersonation_Delete(t *testing.T) {
 
 func TestCreateUserRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &CreateUserRequest{}, "{}")
+	testJSONMarshal(t, &CreateUserRequest{}, `{"login": ""}`)
 
 	u := &CreateUserRequest{
 		Login: "l",
diff --git a/github/apps_installation_test.go b/github/apps_installation_test.go
index 48521504f7a..56ad099aa5d 100644
--- a/github/apps_installation_test.go
+++ b/github/apps_installation_test.go
@@ -176,7 +176,7 @@ func TestAppsService_RevokeInstallationToken(t *testing.T) {
 
 func TestListRepositories_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ListRepositories{}, "{}")
+	testJSONMarshal(t, &ListRepositories{}, `{"repositories": null}`)
 
 	u := &ListRepositories{
 		TotalCount: Ptr(1),
diff --git a/github/billing_test.go b/github/billing_test.go
index 8fb6499c186..2dd25be21c6 100644
--- a/github/billing_test.go
+++ b/github/billing_test.go
@@ -396,7 +396,11 @@ func TestActionBilling_Marshal(t *testing.T) {
 
 func TestPackageBilling_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &PackageBilling{}, "{}")
+	testJSONMarshal(t, &PackageBilling{}, `{
+		"included_gigabytes_bandwidth": 0,
+		"total_gigabytes_bandwidth_used": 0,
+		"total_paid_gigabytes_bandwidth_used": 0
+	}`)
 
 	u := &PackageBilling{
 		TotalGigabytesBandwidthUsed:     1,
@@ -415,7 +419,11 @@ func TestPackageBilling_Marshal(t *testing.T) {
 
 func TestStorageBilling_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &StorageBilling{}, "{}")
+	testJSONMarshal(t, &StorageBilling{}, `{
+		"days_left_in_billing_cycle": 0,
+		"estimated_paid_storage_for_month": 0,
+		"estimated_storage_for_month": 0
+	}`)
 
 	u := &StorageBilling{
 		DaysLeftInBillingCycle:       1,
diff --git a/github/checks_test.go b/github/checks_test.go
index fac30ec2871..32449bc66fa 100644
--- a/github/checks_test.go
+++ b/github/checks_test.go
@@ -1015,7 +1015,11 @@ func TestCheckRunImage_Marshal(t *testing.T) {
 
 func TestCheckRunAction_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &CheckRunAction{}, "{}")
+	testJSONMarshal(t, &CheckRunAction{}, `{
+		"description": "",
+		"identifier": "",
+		"label": ""
+	}`)
 
 	u := &CheckRunAction{
 		Label:       "l",
@@ -1051,7 +1055,7 @@ func TestAutoTriggerCheck_Marshal(t *testing.T) {
 
 func TestCreateCheckSuiteOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &CreateCheckSuiteOptions{}, "{}")
+	testJSONMarshal(t, &CreateCheckSuiteOptions{}, `{"head_sha": ""}`)
 
 	u := &CreateCheckSuiteOptions{
 		HeadSHA:    "hsha",
@@ -1131,7 +1135,7 @@ func TestCheckRunOutput_Marshal(t *testing.T) {
 
 func TestCreateCheckRunOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &CreateCheckRunOptions{}, "{}")
+	testJSONMarshal(t, &CreateCheckRunOptions{}, `{"head_sha": "", "name": ""}`)
 
 	u := &CreateCheckRunOptions{
 		Name:        "n",
@@ -1228,7 +1232,7 @@ func TestCreateCheckRunOptions_Marshal(t *testing.T) {
 
 func TestUpdateCheckRunOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &UpdateCheckRunOptions{}, "{}")
+	testJSONMarshal(t, &UpdateCheckRunOptions{}, `{"name": ""}`)
 
 	u := &UpdateCheckRunOptions{
 		Name:        "n",
diff --git a/github/dependabot_alerts_test.go b/github/dependabot_alerts_test.go
index 3a46855e011..e6bfd59b552 100644
--- a/github/dependabot_alerts_test.go
+++ b/github/dependabot_alerts_test.go
@@ -381,8 +381,7 @@ func TestDependabotSecurityAdvisory_Marshal(t *testing.T) {
         }
       ],
       "published_at": "2018-10-03T21:13:54Z",
-      "updated_at": "2022-04-26T18:35:37Z",
-      "withdrawn_at": null
+      "updated_at": "2022-04-26T18:35:37Z"
 	}`
 
 	testJSONMarshal(t, h, want)
diff --git a/github/enterprise_actions_runner_groups_test.go b/github/enterprise_actions_runner_groups_test.go
index e4d2bfffc2f..4eb704c7df7 100644
--- a/github/enterprise_actions_runner_groups_test.go
+++ b/github/enterprise_actions_runner_groups_test.go
@@ -557,8 +557,7 @@ func TestEnterpriseRunnerGroup_Marshal(t *testing.T) {
 		"runners_url": "r",
 		"inherited": true,
 		"allows_public_repositories": true,
-		"restricted_to_workflows": false,
-		"selected_workflows": []
+		"restricted_to_workflows": false
 	}`
 
 	testJSONMarshal(t, u, want)
@@ -566,7 +565,7 @@ func TestEnterpriseRunnerGroup_Marshal(t *testing.T) {
 
 func TestEnterpriseRunnerGroups_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &EnterpriseRunnerGroups{}, "{}")
+	testJSONMarshal(t, &EnterpriseRunnerGroups{}, `{"runner_groups": null}`)
 
 	u := &EnterpriseRunnerGroups{
 		TotalCount: Ptr(1),
@@ -597,8 +596,7 @@ func TestEnterpriseRunnerGroups_Marshal(t *testing.T) {
 			"runners_url": "r",
 			"inherited": true,
 			"allows_public_repositories": true,
-			"restricted_to_workflows": false,
-			"selected_workflows": []
+			"restricted_to_workflows": false
 		}]
 	}`
 
@@ -648,8 +646,7 @@ func TestUpdateEnterpriseRunnerGroupRequest_Marshal(t *testing.T) {
 		"name": "n",
 		"visibility": "v",
 		"allows_public_repositories": true,
-		"restricted_to_workflows": false,
-		"selected_workflows": []
+		"restricted_to_workflows": false
 	}`
 
 	testJSONMarshal(t, u, want)
@@ -657,7 +654,7 @@ func TestUpdateEnterpriseRunnerGroupRequest_Marshal(t *testing.T) {
 
 func TestSetOrgAccessRunnerGroupRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &SetOrgAccessRunnerGroupRequest{}, "{}")
+	testJSONMarshal(t, &SetOrgAccessRunnerGroupRequest{}, `{"selected_organization_ids": null}`)
 
 	u := &SetOrgAccessRunnerGroupRequest{
 		SelectedOrganizationIDs: []int64{1},
diff --git a/github/event_types_test.go b/github/event_types_test.go
index 296c1d35c9c..f8b444a2139 100644
--- a/github/event_types_test.go
+++ b/github/event_types_test.go
@@ -8536,7 +8536,8 @@ func TestPingEvent_Marshal(t *testing.T) {
 			"events": [
 				"a"
 			],
-			"active": true
+			"active": true,
+			"config": {}
 		},
 		"installation": {
 			"id": 1,
@@ -13269,7 +13270,7 @@ func TestMetaEvent_Marshal(t *testing.T) {
 
 func TestRequestedAction_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &RequestedAction{}, "{}")
+	testJSONMarshal(t, &RequestedAction{}, `{"identifier": ""}`)
 
 	r := &RequestedAction{
 		Identifier: "i",
@@ -13658,11 +13659,6 @@ func TestCustomPropertyEvent_Marshal(t *testing.T) {
           	],
           	"values_editable_by": "org_actors"
         },
-		"repository": {
-			"id": 1,
-			"name": "n",
-			"url": "s"
-		},
 		"sender": {
 			"login": "l",
 			"id": 1,
@@ -13694,8 +13690,8 @@ func TestCustomPropertyEvent_Marshal(t *testing.T) {
 				"public_repos": 1,
 				"followers": 1,
 				"following": 1,
-				"created_at": ` + referenceTimeStr + `,
-				"suspended_at": ` + referenceTimeStr + `,
+				"created_at": "2006-01-02T15:04:05Z",
+				"suspended_at": "2006-01-02T15:04:05Z",
 				"url": "u"
 			},
 			"access_tokens_url": "atu",
@@ -13744,8 +13740,8 @@ func TestCustomPropertyEvent_Marshal(t *testing.T) {
 				"vulnerability_alerts": "va",
 				"workflows": "w"
 			},
-			"created_at": ` + referenceTimeStr + `,
-			"updated_at": ` + referenceTimeStr + `,
+			"created_at": "2006-01-02T15:04:05Z",
+			"updated_at": "2006-01-02T15:04:05Z",
 			"has_multiple_single_files": false,
 			"suspended_by": {
 				"login": "l",
@@ -13763,11 +13759,11 @@ func TestCustomPropertyEvent_Marshal(t *testing.T) {
 				"public_repos": 1,
 				"followers": 1,
 				"following": 1,
-				"created_at": ` + referenceTimeStr + `,
-				"suspended_at": ` + referenceTimeStr + `,
+				"created_at": "2006-01-02T15:04:05Z",
+				"suspended_at": "2006-01-02T15:04:05Z",
 				"url": "u"
 			},
-			"suspended_at": ` + referenceTimeStr + `
+			"suspended_at": "2006-01-02T15:04:05Z"
 		}
 	}`
 
@@ -17810,7 +17806,6 @@ func TestSecurityAdvisoryEvent_Marshal(t *testing.T) {
 		  ],
 		  "published_at": ` + referenceTimeStr + `,
 		  "updated_at": ` + referenceTimeStr + `,
-		  "withdrawn_at": null,
 		  "vulnerabilities": [
 			{
 			  "package": {
@@ -18304,8 +18299,7 @@ func TestSecurityAndAnalysisEvent_Marshal(t *testing.T) {
 			"url": "u",
 			"events_url": "e",
 			"repos_url": "r"
-		},
-		"target_type": "running"
+		}
 	}`
 
 	testJSONMarshal(t, u, want)
@@ -18497,10 +18491,6 @@ func TestCodeScanningAlertEvent_Marshal(t *testing.T) {
 			}
 		  ],
 		  "state": "open",
-		  "fixed_at": null,
-		  "dismissed_by": null,
-		  "dismissed_at": null,
-		  "dismissed_reason": null,
 		  "rule": {
 			"id": "Style/FrozenStringLiteralComment",
 			"severity": "note",
@@ -18512,8 +18502,7 @@ func TestCodeScanningAlertEvent_Marshal(t *testing.T) {
 			"help": "help"
 		  },
 		  "tool": {
-			"name": "Rubocop",
-			"version": null
+			"name": "Rubocop"
 		  }
 		},
 		"ref": "refs/heads/main",
@@ -18545,7 +18534,6 @@ func TestCodeScanningAlertEvent_Marshal(t *testing.T) {
 			"site_admin": false
 		  },
 		  "html_url": "a",
-		  "description": null,
 		  "fork": false,
 		  "url": "a",
 		  "forks_url": "a",
@@ -18591,23 +18579,18 @@ func TestCodeScanningAlertEvent_Marshal(t *testing.T) {
 		  "ssh_url": "a",
 		  "clone_url": "a",
 		  "svn_url": "a",
-		  "homepage": null,
 		  "size": 0,
 		  "stargazers_count": 0,
 		  "watchers_count": 0,
-		  "language": null,
 		  "has_issues": true,
 		  "has_projects": true,
 		  "has_downloads": true,
 		  "has_wiki": true,
 		  "has_pages": true,
 		  "forks_count": 0,
-		  "mirror_url": null,
 		  "archived": false,
 		  "disabled": false,
 		  "open_issues_count": 2,
-		  "license": null,
-		  "forks": 0,
 		  "open_issues": 2,
 		  "watchers": 0,
 		  "default_branch": "main"
diff --git a/github/git_refs_test.go b/github/git_refs_test.go
index 389b23c0c29..4e1ac6d8a43 100644
--- a/github/git_refs_test.go
+++ b/github/git_refs_test.go
@@ -678,7 +678,11 @@ func TestGitService_UpdateRef_pathEscape(t *testing.T) {
 
 func TestReference_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &Reference{}, "{}")
+	testJSONMarshal(t, &Reference{}, `{
+		"object": null,
+		"ref": null,
+		"url": null
+	}`)
 
 	u := &Reference{
 		Ref: Ptr("ref"),
@@ -707,7 +711,11 @@ func TestReference_Marshal(t *testing.T) {
 
 func TestGitObject_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &GitObject{}, "{}")
+	testJSONMarshal(t, &GitObject{}, `{
+		"sha": null,
+		"type": null,
+		"url": null
+	}`)
 
 	u := &GitObject{
 		Type: Ptr("type"),
@@ -726,7 +734,10 @@ func TestGitObject_Marshal(t *testing.T) {
 
 func TestCreateRefRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &createRefRequest{}, "{}")
+	testJSONMarshal(t, &createRefRequest{}, `{
+		"ref": null,
+		"sha": null
+	}`)
 
 	u := &createRefRequest{
 		Ref: Ptr("ref"),
@@ -743,7 +754,7 @@ func TestCreateRefRequest_Marshal(t *testing.T) {
 
 func TestUpdateRefRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &updateRefRequest{}, "{}")
+	testJSONMarshal(t, &updateRefRequest{}, `{"force": null, "sha": null}`)
 
 	u := &updateRefRequest{
 		SHA:   Ptr("sha"),
diff --git a/github/git_trees_test.go b/github/git_trees_test.go
index 0c264470ce2..21cecad4c59 100644
--- a/github/git_trees_test.go
+++ b/github/git_trees_test.go
@@ -383,7 +383,7 @@ func TestTree_Marshal(t *testing.T) {
 
 func TestTreeEntry_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &TreeEntry{}, "{}")
+	testJSONMarshal(t, &TreeEntry{}, `{"sha": null}`)
 
 	u := &TreeEntry{
 		SHA:     Ptr("sha"),
@@ -410,7 +410,7 @@ func TestTreeEntry_Marshal(t *testing.T) {
 
 func TestTreeEntryWithFileDelete_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &treeEntryWithFileDelete{}, "{}")
+	testJSONMarshal(t, &treeEntryWithFileDelete{}, `{"sha": null}`)
 
 	u := &treeEntryWithFileDelete{
 		SHA:     Ptr("sha"),
@@ -437,7 +437,7 @@ func TestTreeEntryWithFileDelete_Marshal(t *testing.T) {
 
 func TestCreateTree_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &createTree{}, "{}")
+	testJSONMarshal(t, &createTree{}, `{"tree": null}`)
 
 	u := &createTree{
 		BaseTree: "bt",
diff --git a/github/github_test.go b/github/github_test.go
index 46245ff76a6..3e16241a662 100644
--- a/github/github_test.go
+++ b/github/github_test.go
@@ -144,26 +144,32 @@ func testBody(t *testing.T, r *http.Request, want string) {
 // to the want string.
 func testJSONMarshal(t *testing.T, v interface{}, want string) {
 	t.Helper()
-	// Unmarshal the wanted JSON, to verify its correctness, and marshal it back
-	// to sort the keys.
-	u := reflect.New(reflect.TypeOf(v)).Interface()
-	if err := json.Unmarshal([]byte(want), &u); err != nil {
-		t.Errorf("Unable to unmarshal JSON for %v: %v", want, err)
-	}
-	w, err := json.MarshalIndent(u, "", "  ")
+	got, err := json.Marshal(v)
 	if err != nil {
-		t.Errorf("Unable to marshal JSON for %#v", u)
+		t.Errorf("Unable to marshal JSON for %#v", v)
+	}
+	got = normalizeJSON(t, got)
+	wantBytes := normalizeJSON(t, []byte(want))
+	diff := cmp.Diff(string(wantBytes), string(got))
+	if diff != "" {
+		t.Errorf("json.Marshal returned:\n%s\nwant:\n%s\ndiff:\n%v", string(got), string(wantBytes), diff)
 	}
+}
 
-	// Marshal the target value.
-	got, err := json.MarshalIndent(v, "", "  ")
+// normalizeJSON normalizes the JSON in b by unmarshaling and marshaling it
+// again.
+func normalizeJSON(t *testing.T, b []byte) []byte {
+	t.Helper()
+	var v interface{}
+	err := json.Unmarshal(b, &v)
 	if err != nil {
-		t.Errorf("Unable to marshal JSON for %#v", v)
+		t.Errorf("Unable to unmarshal JSON for %v: %v", string(b), err)
 	}
-
-	if diff := cmp.Diff(string(w), string(got)); diff != "" {
-		t.Errorf("json.Marshal returned:\n%s\nwant:\n%s\ndiff:\n%v", got, w, diff)
+	w, err := json.MarshalIndent(v, "", "  ")
+	if err != nil {
+		t.Errorf("Unable to marshal JSON for %#v", v)
 	}
+	return w
 }
 
 // Test whether the v fields have the url tag and the parsing of v
@@ -2896,7 +2902,7 @@ func TestBareDo_returnsOpenBody(t *testing.T) {
 
 func TestErrorResponse_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ErrorResponse{}, "{}")
+	testJSONMarshal(t, &ErrorResponse{}, `{"errors": null, "message": ""}`)
 
 	u := &ErrorResponse{
 		Message: "msg",
@@ -2954,7 +2960,16 @@ func TestErrorBlock_Marshal(t *testing.T) {
 
 func TestRateLimitError_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &RateLimitError{}, "{}")
+	testJSONMarshal(t, &RateLimitError{}, `{
+		"Rate": {
+			"limit": 0,
+			"remaining": 0,
+			"reset": `+emptyTimeStr+`,
+			"used": 0
+		},
+		"Response": null,
+		"message": ""
+	}`)
 
 	u := &RateLimitError{
 		Rate: Rate{
@@ -2969,8 +2984,10 @@ func TestRateLimitError_Marshal(t *testing.T) {
 		"Rate": {
 			"limit": 1,
 			"remaining": 1,
-			"reset": ` + referenceTimeStr + `
+			"reset": ` + referenceTimeStr + `,
+			"used": 0
 		},
+		"Response": null,
 		"message": "msg"
 	}`
 
@@ -2979,13 +2996,19 @@ func TestRateLimitError_Marshal(t *testing.T) {
 
 func TestAbuseRateLimitError_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &AbuseRateLimitError{}, "{}")
+	testJSONMarshal(t, &AbuseRateLimitError{}, `{
+		"Response": null,
+		"RetryAfter": null,
+		"message": ""
+	}`)
 
 	u := &AbuseRateLimitError{
 		Message: "msg",
 	}
 
 	want := `{
+		"Response": null,
+		"RetryAfter": null,
 		"message": "msg"
 	}`
 
@@ -2994,7 +3017,12 @@ func TestAbuseRateLimitError_Marshal(t *testing.T) {
 
 func TestError_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &Error{}, "{}")
+	testJSONMarshal(t, &Error{}, `{
+		"code": "",
+		"field": "",
+		"message": "",
+		"resource": ""
+	}`)
 
 	u := &Error{
 		Resource: "res",
diff --git a/github/issue_import_test.go b/github/issue_import_test.go
index fd081d0d233..23d87a7f287 100644
--- a/github/issue_import_test.go
+++ b/github/issue_import_test.go
@@ -369,7 +369,7 @@ func TestIssueImportResponse_Marshal(t *testing.T) {
 
 func TestComment_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &Comment{}, "{}")
+	testJSONMarshal(t, &Comment{}, `{"body": ""}`)
 
 	u := &Comment{
 		CreatedAt: &Timestamp{referenceTime},
@@ -386,7 +386,7 @@ func TestComment_Marshal(t *testing.T) {
 
 func TestIssueImport_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &IssueImport{}, "{}")
+	testJSONMarshal(t, &IssueImport{}, `{"body": "", "title": ""}`)
 
 	u := &IssueImport{
 		Title:     "title",
@@ -419,7 +419,12 @@ func TestIssueImport_Marshal(t *testing.T) {
 
 func TestIssueImportRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &IssueImportRequest{}, "{}")
+	testJSONMarshal(t, &IssueImportRequest{}, `{
+		"issue": {
+		"body": "",
+		"title": ""
+		}
+	}`)
 
 	u := &IssueImportRequest{
 		IssueImport: IssueImport{
diff --git a/github/issues_events_test.go b/github/issues_events_test.go
index 043caedadc7..85b57951251 100644
--- a/github/issues_events_test.go
+++ b/github/issues_events_test.go
@@ -430,9 +430,6 @@ func TestIssueEvent_Marshal(t *testing.T) {
 			"to": "to"
 		},
 		"lock_reason": "lr",
-		"project_card": {
-			"id": 1
-		},
 		"dismissed_review": {
 			"state": "state",
 			"review_id": 1,
diff --git a/github/issues_timeline_test.go b/github/issues_timeline_test.go
index ed7649489e2..5185cd9f5eb 100644
--- a/github/issues_timeline_test.go
+++ b/github/issues_timeline_test.go
@@ -247,9 +247,6 @@ func TestTimeline_Marshal(t *testing.T) {
 			"from": "from",
 			"to": "to"
 		},
-		"project_card": {
-			"id": 1
-		},
 		"state": "state"
 	}`
 
diff --git a/github/meta_test.go b/github/meta_test.go
index 71eb2149328..3db44bbafac 100644
--- a/github/meta_test.go
+++ b/github/meta_test.go
@@ -63,7 +63,7 @@ func TestAPIMeta_Marshal(t *testing.T) {
 		"ssh_keys":["k"],
 		"api":["a"],
 		"web":["w"],
-		"domains":{"website":["*.github.com","*.github.dev","*.github.io","*.githubassets.com","*.githubusercontent.com"],"artifact_attestations":{"trust_domain":"","services":["*.actions.githubusercontent.com","tuf-repo.github.com","fulcio.githubapp.com","timestamp.githubapp.com"]}}
+		"domains":{"website":["*.github.com","*.github.dev","*.github.io","*.githubassets.com","*.githubusercontent.com"],"artifact_attestations":{"services":["*.actions.githubusercontent.com","tuf-repo.github.com","fulcio.githubapp.com","timestamp.githubapp.com"]}}
 	}`
 
 	testJSONMarshal(t, a, want)
diff --git a/github/orgs_audit_log_test.go b/github/orgs_audit_log_test.go
index f4b617c587b..5235473197a 100644
--- a/github/orgs_audit_log_test.go
+++ b/github/orgs_audit_log_test.go
@@ -7,6 +7,7 @@ package github
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"strings"
@@ -175,7 +176,18 @@ func TestOrganizationService_GetAuditLog(t *testing.T) {
 
 func TestGetAuditLogOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &GetAuditLogOptions{}, "{}")
+	testJSONMarshal(t, &GetAuditLogOptions{}, `{
+		"After": "",
+		"Before": "",
+		"Cursor": "",
+		"First": 0,
+		"Include": null,
+		"Last": 0,
+		"Order": null,
+		"Page": "",
+		"PerPage": 0,
+		"Phrase": null
+	}`)
 
 	u := &GetAuditLogOptions{
 		Phrase:  Ptr("p"),
@@ -190,13 +202,16 @@ func TestGetAuditLogOptions_Marshal(t *testing.T) {
 	}
 
 	want := `{
-		"phrase": "p",
-		"include": "i",
-		"order": "o",
+		"Phrase": "p",
+		"Include": "i",
+		"Order": "o",
 		"Page": "p",
 		"PerPage": 1,
 		"After": "a",
-		"Before": "b"
+		"Before": "b",
+		"Cursor": "",
+    	"First": 0,
+		"Last": 0
 	}`
 
 	testJSONMarshal(t, u, want)
@@ -421,3 +436,128 @@ func TestAuditEntry_Marshal(t *testing.T) {
 
 	testJSONMarshal(t, u, want)
 }
+
+func TestAuditEntry_Unmarshal(t *testing.T) {
+	t.Parallel()
+
+	// Test case 1: JSON with both defined fields and additional fields
+	jsonData := `{
+		"action": "org.update_member",
+		"actor": "testuser",
+		"actor_location": {
+			"country_code": "US"
+		},
+		"created_at": "2021-03-07T00:35:08.000Z",
+		"org": "testorg",
+		"org_id": 12345,
+		"user": "memberuser",
+		"user_id": 67890,
+		"custom_field": "custom_value",
+		"another_field": 42,
+		"nested_field": {
+			"key": "value"
+		},
+		"array_field": ["item1", "item2"]
+	}`
+
+	var entry AuditEntry
+	err := json.Unmarshal([]byte(jsonData), &entry)
+	if err != nil {
+		t.Errorf("Error unmarshaling JSON: %v", err)
+	}
+
+	// Check defined fields
+	if *entry.Action != "org.update_member" {
+		t.Errorf("Action = %v, want %v", *entry.Action, "org.update_member")
+	}
+	if *entry.Actor != "testuser" {
+		t.Errorf("Actor = %v, want %v", *entry.Actor, "testuser")
+	}
+	if *entry.ActorLocation.CountryCode != "US" {
+		t.Errorf("ActorLocation.CountryCode = %v, want %v", *entry.ActorLocation.CountryCode, "US")
+	}
+	if *entry.Org != "testorg" {
+		t.Errorf("Org = %v, want %v", *entry.Org, "testorg")
+	}
+	if *entry.OrgID != 12345 {
+		t.Errorf("OrgID = %v, want %v", *entry.OrgID, 12345)
+	}
+	if *entry.User != "memberuser" {
+		t.Errorf("User = %v, want %v", *entry.User, "memberuser")
+	}
+	if *entry.UserID != 67890 {
+		t.Errorf("UserID = %v, want %v", *entry.UserID, 67890)
+	}
+
+	// Check additional fields
+	if entry.AdditionalFields["custom_field"] != "custom_value" {
+		t.Errorf("AdditionalFields[\"custom_field\"] = %v, want %v", entry.AdditionalFields["custom_field"], "custom_value")
+	}
+	if entry.AdditionalFields["another_field"] != float64(42) {
+		t.Errorf("AdditionalFields[\"another_field\"] = %v, want %v", entry.AdditionalFields["another_field"], float64(42))
+	}
+
+	// Check nested fields
+	nestedField, ok := entry.AdditionalFields["nested_field"].(map[string]interface{})
+	if !ok {
+		t.Errorf("AdditionalFields[\"nested_field\"] is not a map")
+	} else if nestedField["key"] != "value" {
+		t.Errorf("AdditionalFields[\"nested_field\"][\"key\"] = %v, want %v", nestedField["key"], "value")
+	}
+
+	// Check array fields
+	arrayField, ok := entry.AdditionalFields["array_field"].([]interface{})
+	if !ok {
+		t.Errorf("AdditionalFields[\"array_field\"] is not an array")
+	} else {
+		if len(arrayField) != 2 {
+			t.Errorf("len(AdditionalFields[\"array_field\"]) = %v, want %v", len(arrayField), 2)
+		}
+		if arrayField[0] != "item1" {
+			t.Errorf("AdditionalFields[\"array_field\"][0] = %v, want %v", arrayField[0], "item1")
+		}
+		if arrayField[1] != "item2" {
+			t.Errorf("AdditionalFields[\"array_field\"][1] = %v, want %v", arrayField[1], "item2")
+		}
+	}
+
+	// Test case 2: Empty JSON
+	err = json.Unmarshal([]byte("{}"), &entry)
+	if err != nil {
+		t.Errorf("Error unmarshaling empty JSON: %v", err)
+	}
+	if entry.AdditionalFields != nil {
+		t.Errorf("AdditionalFields = %v, want nil", entry.AdditionalFields)
+	}
+
+	// Test case 3: JSON with only additional fields
+	jsonData = `{
+		"custom_field": "custom_value",
+		"another_field": 42
+	}`
+
+	err = json.Unmarshal([]byte(jsonData), &entry)
+	if err != nil {
+		t.Errorf("Error unmarshaling JSON with only additional fields: %v", err)
+	}
+	if entry.AdditionalFields["custom_field"] != "custom_value" {
+		t.Errorf("AdditionalFields[\"custom_field\"] = %v, want %v", entry.AdditionalFields["custom_field"], "custom_value")
+	}
+	if entry.AdditionalFields["another_field"] != float64(42) {
+		t.Errorf("AdditionalFields[\"another_field\"] = %v, want %v", entry.AdditionalFields["another_field"], float64(42))
+	}
+
+	// Test case 4: Test that nil values in AdditionalFields are removed
+	jsonData = `{
+		"action": "org.update_member",
+		"null_field": null
+	}`
+
+	err = json.Unmarshal([]byte(jsonData), &entry)
+	if err != nil {
+		t.Errorf("Error unmarshaling JSON with null field: %v", err)
+	}
+	if _, exists := entry.AdditionalFields["null_field"]; exists {
+		t.Errorf("AdditionalFields contains null_field, but it should have been removed")
+	}
+}
diff --git a/github/orgs_personal_access_tokens_test.go b/github/orgs_personal_access_tokens_test.go
index 8322c403916..76c3e86356d 100644
--- a/github/orgs_personal_access_tokens_test.go
+++ b/github/orgs_personal_access_tokens_test.go
@@ -199,7 +199,7 @@ func TestOrganizationsService_ReviewPersonalAccessTokenRequest(t *testing.T) {
 
 func TestReviewPersonalAccessTokenRequestOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ReviewPersonalAccessTokenRequestOptions{}, "{}")
+	testJSONMarshal(t, &ReviewPersonalAccessTokenRequestOptions{}, `{"action": ""}`)
 
 	u := &ReviewPersonalAccessTokenRequestOptions{
 		Action: "a",
diff --git a/github/packages_test.go b/github/packages_test.go
index 414ba503824..187297a95eb 100644
--- a/github/packages_test.go
+++ b/github/packages_test.go
@@ -1223,7 +1223,7 @@ func TestPackageNPMMetadata_Marshal(t *testing.T) {
 				"homepage": "h",
 				"license": "l",
 				"main": "m",
-				"ID": "id",
+				"id": "id",
 				"node_version": "nv",
 				"npm_version": "npmv",
 				"readme": "r",
diff --git a/github/rate_limit_test.go b/github/rate_limit_test.go
index 8e7f2c83563..71773638847 100644
--- a/github/rate_limit_test.go
+++ b/github/rate_limit_test.go
@@ -366,7 +366,19 @@ func TestRateLimits_overQuota(t *testing.T) {
 
 func TestRateLimits_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &RateLimits{}, "{}")
+	testJSONMarshal(t, &RateLimits{}, `{
+		"actions_runner_registration": null,
+		"audit_log": null,
+		"code_scanning_upload": null,
+		"code_search": null,
+		"core": null,
+		"dependency_snapshots": null,
+		"graphql": null,
+		"integration_manifest": null,
+		"scim": null,
+		"search": null,
+		"source_import": null
+	}`)
 
 	u := &RateLimits{
 		Core: &Rate{
@@ -511,7 +523,12 @@ func TestRateLimits_Marshal(t *testing.T) {
 
 func TestRate_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &Rate{}, "{}")
+	testJSONMarshal(t, &Rate{}, `{
+		"limit": 0,
+		"remaining": 0,
+		"reset": "0001-01-01T00:00:00Z",
+		"used": 0
+	}`)
 
 	u := &Rate{
 		Limit:     1,
diff --git a/github/repos_codeowners_test.go b/github/repos_codeowners_test.go
index 0b3c784274b..09cf3e11d81 100644
--- a/github/repos_codeowners_test.go
+++ b/github/repos_codeowners_test.go
@@ -140,7 +140,7 @@ func TestRepositoriesService_GetCodeownersErrors_specificRef(t *testing.T) {
 
 func TestCodeownersErrors_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &CodeownersErrors{}, "{}")
+	testJSONMarshal(t, &CodeownersErrors{}, `{"errors": null}`)
 
 	u := &CodeownersErrors{
 		Errors: []*CodeownersError{
diff --git a/github/repos_comments_test.go b/github/repos_comments_test.go
index c415b1c3202..c6d61e561ff 100644
--- a/github/repos_comments_test.go
+++ b/github/repos_comments_test.go
@@ -296,7 +296,7 @@ func TestRepositoriesService_DeleteComment_invalidOwner(t *testing.T) {
 
 func TestRepositoryComment_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &RepositoryComment{}, "{}")
+	testJSONMarshal(t, &RepositoryComment{}, `{"body": null}`)
 
 	r := &RepositoryComment{
 		HTMLURL:  Ptr("hurl"),
diff --git a/github/repos_community_health_test.go b/github/repos_community_health_test.go
index eb7f2ce507c..39720d97206 100644
--- a/github/repos_community_health_test.go
+++ b/github/repos_community_health_test.go
@@ -135,7 +135,14 @@ func TestRepositoriesService_GetCommunityHealthMetrics(t *testing.T) {
 
 func TestMetric_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &Metric{}, "{}")
+	testJSONMarshal(t, &Metric{}, `{
+		"html_url": null,
+		"key": null,
+		"name": null,
+		"node_id": null,
+		"spdx_id": null,
+		"url": null
+	}`)
 
 	r := &Metric{
 		Name:    Ptr("name"),
@@ -160,7 +167,15 @@ func TestMetric_Marshal(t *testing.T) {
 
 func TestCommunityHealthFiles_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &CommunityHealthFiles{}, "{}")
+	testJSONMarshal(t, &CommunityHealthFiles{}, `{
+		"code_of_conduct": null,
+		"code_of_conduct_file": null,
+		"contributing": null,
+		"issue_template": null,
+		"license": null,
+		"pull_request_template": null,
+		"readme": null
+	}`)
 
 	r := &CommunityHealthFiles{
 		CodeOfConduct: &Metric{
@@ -214,31 +229,41 @@ func TestCommunityHealthFiles_Marshal(t *testing.T) {
 			"name": "name",
 			"key": "key",
 			"url": "url",
-			"html_url": "hurl"
+			"html_url": "hurl",
+			"node_id": null,
+			"spdx_id": null
 		},
 		"code_of_conduct_file": {
 			"name": "name",
 			"key": "key",
-                        "url": "url",
-                        "html_url": "hurl"
-                },
+			"url": "url",
+			"html_url": "hurl",
+			"node_id": null,
+			"spdx_id": null
+		},
 		"contributing": {
 			"name": "name",
 			"key": "key",
 			"url": "url",
-			"html_url": "hurl"
+			"html_url": "hurl",
+			"node_id": null,
+			"spdx_id": null
 		},
 		"issue_template": {
 			"name": "name",
 			"key": "key",
 			"url": "url",
-			"html_url": "hurl"
+			"html_url": "hurl",
+			"node_id": null,
+			"spdx_id": null
 		},
 		"pull_request_template": {
 			"name": "name",
 			"key": "key",
 			"url": "url",
-			"html_url": "hurl"
+			"html_url": "hurl",
+			"node_id": null,
+			"spdx_id": null
 		},
 		"license": {
 			"name": "name",
@@ -252,7 +277,9 @@ func TestCommunityHealthFiles_Marshal(t *testing.T) {
 			"name": "name",
 			"key": "key",
 			"url": "url",
-			"html_url": "hurl"
+			"html_url": "hurl",
+			"node_id": null,
+			"spdx_id": null
 		}
 	}`
 
@@ -261,7 +288,14 @@ func TestCommunityHealthFiles_Marshal(t *testing.T) {
 
 func TestCommunityHealthMetrics_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &CommunityHealthMetrics{}, "{}")
+	testJSONMarshal(t, &CommunityHealthMetrics{}, `{
+		"content_reports_enabled": null,
+		"description": null,
+		"documentation": null,
+		"files": null,
+		"health_percentage": null,
+		"updated_at": null
+	}`)
 
 	r := &CommunityHealthMetrics{
 		HealthPercentage: Ptr(1),
@@ -326,31 +360,41 @@ func TestCommunityHealthMetrics_Marshal(t *testing.T) {
 				"name": "name",
 				"key": "key",
 				"url": "url",
-				"html_url": "hurl"
+				"html_url": "hurl",
+				"node_id": null,
+              	"spdx_id": null
 			},
 			"code_of_conduct_file": {
-                                "name": "name",
-                                "key": "key",
-                                "url": "url",
-                                "html_url": "hurl"
-                        },
+				"name": "name",
+				"key": "key",
+				"url": "url",
+				"html_url": "hurl",
+				"node_id": null,
+              	"spdx_id": null
+			},
 			"contributing": {
 				"name": "name",
 				"key": "key",
 				"url": "url",
-				"html_url": "hurl"
+				"html_url": "hurl",
+				"node_id": null,
+              	"spdx_id": null
 			},
 			"issue_template": {
 				"name": "name",
 				"key": "key",
 				"url": "url",
-				"html_url": "hurl"
+				"html_url": "hurl",
+				"node_id": null,
+              	"spdx_id": null
 			},
 			"pull_request_template": {
 				"name": "name",
 				"key": "key",
 				"url": "url",
-				"html_url": "hurl"
+				"html_url": "hurl",
+				"node_id": null,
+              	"spdx_id": null
 			},
 			"license": {
 				"name": "name",
@@ -364,7 +408,9 @@ func TestCommunityHealthMetrics_Marshal(t *testing.T) {
 				"name": "name",
 				"key": "key",
 				"url": "url",
-				"html_url": "hurl"
+				"html_url": "hurl",
+				"node_id": null,
+              	"spdx_id": null
 			}
 		},
 		"updated_at": ` + referenceTimeStr + `,
diff --git a/github/repos_contents_test.go b/github/repos_contents_test.go
index d5ad45a0f21..c6a02835e94 100644
--- a/github/repos_contents_test.go
+++ b/github/repos_contents_test.go
@@ -910,7 +910,7 @@ func TestRepositoryContent_Marshal(t *testing.T) {
 
 func TestRepositoryContentResponse_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &RepositoryContentResponse{}, "{}")
+	testJSONMarshal(t, &RepositoryContentResponse{}, `{"commit": {}}`)
 
 	r := &RepositoryContentResponse{
 		Content: &RepositoryContent{
@@ -1034,7 +1034,7 @@ func TestRepositoryContentResponse_Marshal(t *testing.T) {
 
 func TestRepositoryContentFileOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &RepositoryContentFileOptions{}, "{}")
+	testJSONMarshal(t, &RepositoryContentFileOptions{}, `{"content": null}`)
 
 	r := &RepositoryContentFileOptions{
 		Message: Ptr("type"),
diff --git a/github/repos_hooks_test.go b/github/repos_hooks_test.go
index 17b13daadd4..18e4399760a 100644
--- a/github/repos_hooks_test.go
+++ b/github/repos_hooks_test.go
@@ -502,7 +502,7 @@ func TestBranchWebHookCommit_Marshal(t *testing.T) {
 
 func TestBranchCreateHookRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &createHookRequest{}, "{}")
+	testJSONMarshal(t, &createHookRequest{}, `{"name": ""}`)
 
 	v := &createHookRequest{
 		Name:   "abc",
diff --git a/github/repos_pages_test.go b/github/repos_pages_test.go
index 31a2ee1b2ee..c698c188f80 100644
--- a/github/repos_pages_test.go
+++ b/github/repos_pages_test.go
@@ -569,7 +569,7 @@ func TestPagesError_Marshal(t *testing.T) {
 
 func TestPagesUpdate_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &PagesUpdate{}, "{}")
+	testJSONMarshal(t, &PagesUpdate{}, `{"cname": null}`)
 
 	u := &PagesUpdate{
 		CNAME:  Ptr("cname"),
diff --git a/github/repos_releases_test.go b/github/repos_releases_test.go
index 011e8cf67bf..8fbcb1664f0 100644
--- a/github/repos_releases_test.go
+++ b/github/repos_releases_test.go
@@ -899,7 +899,7 @@ func TestRepositoryRelease_Marshal(t *testing.T) {
 
 func TestGenerateNotesOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &GenerateNotesOptions{}, "{}")
+	testJSONMarshal(t, &GenerateNotesOptions{}, `{"tag_name": ""}`)
 
 	u := &GenerateNotesOptions{
 		TagName:         "tag_name",
diff --git a/github/repos_tags_test.go b/github/repos_tags_test.go
index 5b05694f76a..1c507d41d23 100644
--- a/github/repos_tags_test.go
+++ b/github/repos_tags_test.go
@@ -133,7 +133,10 @@ func TestRepositoriesService_DeleteTagProtection(t *testing.T) {
 
 func TestTagProtection_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &TagProtection{}, "{}")
+	testJSONMarshal(t, &TagProtection{}, `{
+		"id": null,
+		"pattern": null
+	}`)
 
 	u := &TagProtection{
 		ID:      Ptr(int64(1)),
diff --git a/github/repos_test.go b/github/repos_test.go
index ccbbf13384e..e9c6033dcac 100644
--- a/github/repos_test.go
+++ b/github/repos_test.go
@@ -4298,7 +4298,7 @@ func TestAuthorizedActorsOnly_Marshal(t *testing.T) {
 
 func TestDispatchRequestOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &DispatchRequestOptions{}, "{}")
+	testJSONMarshal(t, &DispatchRequestOptions{}, `{"event_type": ""}`)
 
 	cp := json.RawMessage(`{"testKey":"testValue"}`)
 	u := &DispatchRequestOptions{
@@ -4318,7 +4318,7 @@ func TestDispatchRequestOptions_Marshal(t *testing.T) {
 
 func TestTransferRequest_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &TransferRequest{}, "{}")
+	testJSONMarshal(t, &TransferRequest{}, `{"new_owner": ""}`)
 
 	u := &TransferRequest{
 		NewOwner: "testOwner",
@@ -4385,7 +4385,7 @@ func TestDismissalRestrictionsRequest_Marshal(t *testing.T) {
 
 func TestAdminEnforcement_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &AdminEnforcement{}, "{}")
+	testJSONMarshal(t, &AdminEnforcement{}, `{"enabled": false}`)
 
 	u := &AdminEnforcement{
 		URL:     Ptr("https://www.test-url.in"),
@@ -4402,7 +4402,7 @@ func TestAdminEnforcement_Marshal(t *testing.T) {
 
 func TestPullRequestReviewsEnforcementUpdate_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &PullRequestReviewsEnforcementUpdate{}, "{}")
+	testJSONMarshal(t, &PullRequestReviewsEnforcementUpdate{}, `{"required_approving_review_count": 0}`)
 
 	u := &PullRequestReviewsEnforcementUpdate{
 		BypassPullRequestAllowancesRequest: &BypassPullRequestAllowancesRequest{
@@ -4431,7 +4431,7 @@ func TestPullRequestReviewsEnforcementUpdate_Marshal(t *testing.T) {
 
 func TestRequiredStatusCheck_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &RequiredStatusCheck{}, "{}")
+	testJSONMarshal(t, &RequiredStatusCheck{}, `{"context": ""}`)
 
 	u := &RequiredStatusCheck{
 		Context: "ctx",
diff --git a/github/repos_traffic_test.go b/github/repos_traffic_test.go
index e1374d8c461..5b2971df9f4 100644
--- a/github/repos_traffic_test.go
+++ b/github/repos_traffic_test.go
@@ -226,7 +226,7 @@ func TestTrafficViews_Marshal(t *testing.T) {
 
 	u := &TrafficViews{
 		Views: []*TrafficData{{
-			Timestamp: &Timestamp{time.Date(2016, time.May, 31, 16, 0, 0, 0, time.UTC)},
+			Timestamp: &Timestamp{referenceTime},
 			Count:     Ptr(7),
 			Uniques:   Ptr(6),
 		}},
@@ -236,7 +236,7 @@ func TestTrafficViews_Marshal(t *testing.T) {
 
 	want := `{
 		"views": [{
-			"timestamp": "2016-05-31T16:00:00.000Z",
+			"timestamp": ` + referenceTimeStr + `,
 			"count": 7,
 			"uniques": 6
 		}],
@@ -253,7 +253,7 @@ func TestTrafficClones_Marshal(t *testing.T) {
 
 	u := &TrafficClones{
 		Clones: []*TrafficData{{
-			Timestamp: &Timestamp{time.Date(2021, time.October, 29, 16, 0, 0, 0, time.UTC)},
+			Timestamp: &Timestamp{referenceTime},
 			Count:     Ptr(1),
 			Uniques:   Ptr(1),
 		}},
@@ -263,7 +263,7 @@ func TestTrafficClones_Marshal(t *testing.T) {
 
 	want := `{
 		"clones": [{
-			"timestamp": "2021-10-29T16:00:00.000Z",
+			"timestamp": ` + referenceTimeStr + `,
 			"count": 1,
 			"uniques": 1
 		}],
@@ -300,13 +300,13 @@ func TestTrafficData_Marshal(t *testing.T) {
 	testJSONMarshal(t, &TrafficData{}, "{}")
 
 	u := &TrafficData{
-		Timestamp: &Timestamp{time.Date(2016, time.May, 31, 16, 0, 0, 0, time.UTC)},
+		Timestamp: &Timestamp{referenceTime},
 		Count:     Ptr(7),
 		Uniques:   Ptr(6),
 	}
 
 	want := `{
-			"timestamp": "2016-05-31T16:00:00.000Z",
+			"timestamp": ` + referenceTimeStr + `,
 			"count": 7,
 			"uniques": 6
       }`
@@ -316,14 +316,14 @@ func TestTrafficData_Marshal(t *testing.T) {
 
 func TestTrafficBreakdownOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &TrafficBreakdownOptions{}, "{}")
+	testJSONMarshal(t, &TrafficBreakdownOptions{}, `{"Per": ""}`)
 
 	u := &TrafficBreakdownOptions{
 		Per: "day",
 	}
 
 	want := `{
-		"per": "day"
+		"Per": "day"
 	}`
 
 	testJSONMarshal(t, u, want)
diff --git a/github/scim_test.go b/github/scim_test.go
index 42a6f2331ed..cc23329d29c 100644
--- a/github/scim_test.go
+++ b/github/scim_test.go
@@ -501,7 +501,7 @@ func TestSCIMUserAttributes_Marshal(t *testing.T) {
 
 func TestUpdateAttributeForSCIMUserOperations_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &UpdateAttributeForSCIMUserOperations{}, `{}`)
+	testJSONMarshal(t, &UpdateAttributeForSCIMUserOperations{}, `{"op": ""}`)
 
 	u := &UpdateAttributeForSCIMUserOperations{
 		Op:   "TestOp",
@@ -518,7 +518,7 @@ func TestUpdateAttributeForSCIMUserOperations_Marshal(t *testing.T) {
 
 func TestUpdateAttributeForSCIMUserOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &UpdateAttributeForSCIMUserOptions{}, `{}`)
+	testJSONMarshal(t, &UpdateAttributeForSCIMUserOptions{}, `{"operations":{"op": ""}}`)
 
 	u := &UpdateAttributeForSCIMUserOptions{
 		Schemas: []string{"test", "schema"},
diff --git a/github/search_test.go b/github/search_test.go
index d9fcb66c5bf..15f39c3322f 100644
--- a/github/search_test.go
+++ b/github/search_test.go
@@ -755,7 +755,13 @@ func TestLabelResult_Marshal(t *testing.T) {
 
 func TestSearchOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &SearchOptions{}, "{}")
+	testJSONMarshal(t, &SearchOptions{}, `{
+		"Order": "",
+		"Page": 0,
+		"PerPage": 0,
+		"Sort": "",
+		"TextMatch": false
+	}`)
 
 	u := &SearchOptions{
 		Sort:      "author-date",
@@ -768,11 +774,12 @@ func TestSearchOptions_Marshal(t *testing.T) {
 	}
 
 	want := `{
-		"sort": "author-date",
-		"order": "asc",
-		"page": 1,
-		"perPage": 10
-      }`
+		"Order": "asc",
+		"Page": 1,
+		"PerPage": 10,
+		"Sort": "author-date",
+		"TextMatch": false
+	}`
 
 	testJSONMarshal(t, u, want)
 }
diff --git a/github/secret_scanning_test.go b/github/secret_scanning_test.go
index 779785396f1..68fd6787d88 100644
--- a/github/secret_scanning_test.go
+++ b/github/secret_scanning_test.go
@@ -603,7 +603,7 @@ func TestSecretScanningAlertLocationDetails_Marshal(t *testing.T) {
 
 func TestSecretScanningAlertUpdateOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &SecretScanningAlertUpdateOptions{}, `{}`)
+	testJSONMarshal(t, &SecretScanningAlertUpdateOptions{}, `{"state": ""}`)
 
 	u := &SecretScanningAlertUpdateOptions{
 		State:      "open",
diff --git a/github/teams_members_test.go b/github/teams_members_test.go
index 4cd41d4fc2a..ffa69441f50 100644
--- a/github/teams_members_test.go
+++ b/github/teams_members_test.go
@@ -807,7 +807,11 @@ func TestTeamAddTeamMembershipOptions_Marshal(t *testing.T) {
 
 func TestTeamListTeamMembersOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &TeamListTeamMembersOptions{}, "{}")
+	testJSONMarshal(t, &TeamListTeamMembersOptions{}, `{
+		"Page": 0,
+		"PerPage": 0,
+		"Role": ""
+	}`)
 
 	u := &TeamListTeamMembersOptions{
 		Role: "role",
@@ -818,7 +822,7 @@ func TestTeamListTeamMembersOptions_Marshal(t *testing.T) {
 	}
 
 	want := `{
-		"role": "role",
+		"Role": "role",
 		"Page": 1,
 		"PerPage": 2
 	}`
diff --git a/github/teams_test.go b/github/teams_test.go
index 1e3d3da2980..1db93f752ef 100644
--- a/github/teams_test.go
+++ b/github/teams_test.go
@@ -1579,7 +1579,7 @@ func TestTeamsService_CreateOrUpdateIDPGroupConnectionsBySlug_empty(t *testing.T
 
 func TestNewTeam_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &NewTeam{}, "{}")
+	testJSONMarshal(t, &NewTeam{}, `{"name": ""}`)
 
 	u := &NewTeam{
 		Name:                "n",
@@ -2171,7 +2171,7 @@ func TestTeamsService_RemoveConnectedExternalGroup_notFound(t *testing.T) {
 
 func TestIDPGroupList_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &IDPGroupList{}, "{}")
+	testJSONMarshal(t, &IDPGroupList{}, `{"groups": null}`)
 
 	u := &IDPGroupList{
 		Groups: []*IDPGroup{
@@ -2301,7 +2301,11 @@ func TestExternalGroupTeam_Marshal(t *testing.T) {
 
 func TestListExternalGroupsOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &ListExternalGroupsOptions{}, "{}")
+	testJSONMarshal(t, &ListExternalGroupsOptions{}, `{
+		"DisplayName": null,
+		"Page": 0,
+		"PerPage": 0
+	}`)
 
 	u := &ListExternalGroupsOptions{
 		DisplayName: Ptr("test"),
@@ -2313,7 +2317,7 @@ func TestListExternalGroupsOptions_Marshal(t *testing.T) {
 
 	want := `{
 		"DisplayName": "test",
-		"page":	1,
+		"Page":	1,
 		"PerPage":	2
 	}`
 
diff --git a/github/users_test.go b/github/users_test.go
index 96332b15567..9d91ad51141 100644
--- a/github/users_test.go
+++ b/github/users_test.go
@@ -496,7 +496,11 @@ func TestHovercard_Marshal(t *testing.T) {
 
 func TestUserListOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &UserListOptions{}, "{}")
+	testJSONMarshal(t, &UserListOptions{}, `{
+		"Page": 0,
+		"PerPage": 0,
+		"Since": 0
+	}`)
 
 	u := &UserListOptions{
 		Since: int64(1900),
@@ -507,9 +511,9 @@ func TestUserListOptions_Marshal(t *testing.T) {
 	}
 
 	want := `{
-		"since" : 1900,
-		"page": 1,
-		"perPage": 10
+		"Since" : 1900,
+		"Page": 1,
+		"PerPage": 10
 	}`
 
 	testJSONMarshal(t, u, want)
@@ -517,7 +521,10 @@ func TestUserListOptions_Marshal(t *testing.T) {
 
 func TestHovercardOptions_Marshal(t *testing.T) {
 	t.Parallel()
-	testJSONMarshal(t, &HovercardOptions{}, "{}")
+	testJSONMarshal(t, &HovercardOptions{}, `{
+		"SubjectType" : "",
+		"SubjectID" : ""
+	}`)
 
 	u := &HovercardOptions{
 		SubjectType: "subjectType",