diff --git a/compose/encoder/record_test.go b/compose/encoder/record_test.go
index d3e64f18e..406a13e8d 100644
--- a/compose/encoder/record_test.go
+++ b/compose/encoder/record_test.go
@@ -59,7 +59,6 @@ func Test_RecordEncoding(t *testing.T) {
 			structResult: `{"createdAt":"2017-09-09T17:00:00Z","deletedAt":null,"ownedBy":"12345","recordID":"12345"}` + "\n" +
 				`{"createdAt":"1970-01-01T03:25:45Z","deletedAt":null,"fff":["1","2"],"foo":"bar","ownedBy":"12345","recordID":"54321"}` + "\n",
 		},
-		// TODO: Add test cases.
 	}
 
 	for _, tt := range tests {
diff --git a/compose/types/module_field_options_test.go b/compose/types/module_field_options_test.go
index a1ade3a60..c42d31833 100644
--- a/compose/types/module_field_options_test.go
+++ b/compose/types/module_field_options_test.go
@@ -12,7 +12,6 @@ func TestModuleFieldOptions_Int64Def(t *testing.T) {
 		def  int64
 		want int64
 	}{
-		// TODO: Add test cases.
 		{"unexisting", ModuleFieldOptions{}, "k", 42, 42},
 		{"nil", ModuleFieldOptions{"k": nil}, "k", 42, 42},
 		{"bool", ModuleFieldOptions{"k": true}, "k", 42, 42},
diff --git a/pkg/handle/handle_test.go b/pkg/handle/handle_test.go
index 5628e4271..6fd7e3075 100644
--- a/pkg/handle/handle_test.go
+++ b/pkg/handle/handle_test.go
@@ -10,7 +10,6 @@ func TestIsValid(t *testing.T) {
 		handle string
 		want   bool
 	}{
-		// TODO: Add test cases.
 		{"empty", "", true},
 		{"alphanum", "a1", true},
 		{"alpha", "abc", true},
diff --git a/system/service/auth_test.go b/system/service/auth_test.go
index b665c0893..af16f36d6 100644
--- a/system/service/auth_test.go
+++ b/system/service/auth_test.go
@@ -356,7 +356,6 @@ func Test_auth_validateToken(t *testing.T) {
 		wantID          uint64
 		wantCredentials string
 	}{
-		// TODO: Add test cases.
 		{
 			name:            "empty",
 			wantID:          0,
diff --git a/system/types/mailproc_test.go b/system/types/mailproc_test.go
index 12d4299f6..d19ed36ff 100644
--- a/system/types/mailproc_test.go
+++ b/system/types/mailproc_test.go
@@ -15,7 +15,6 @@ func Test_mailProcMessage(t *testing.T) {
 		wantOut *MailMessage
 		wantErr bool
 	}{
-		// TODO: Add test cases.
 		{name: "basics",
 			input: `
 From: <sender@testing.cortezaproject.org>