fix merging errors

tests/integration/golang/aim/app/update_app_test.go

@@ -159,7 +159,7 @@ func (s *UpdateAppTestSuite) Test_Error() {
 				).WithResponse(
 					&resp,
 				).DoRequest(
-					"/apps/%s", app.ID,
+					"/apps/%s", tt.ID,
 				),
 			)
 			assert.Contains(s.T(), resp.Message, tt.error)

tests/integration/golang/aim/dashboard/update_dashboard_test.go

@@ -5,7 +5,6 @@ package run
 import (
 	"context"
 	"net/http"
-	"net/http"
 	"testing"
 	"time"
 
@@ -181,20 +180,16 @@ func (s *UpdateDashboardTestSuite) Test_Error() {
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(T *testing.T) {
 			var resp response.Error
-			assert.Nil(s.T(), s.AIMClient.WithMethod(
-				http.MethodPut,
-			).WithRequest(
 			assert.Nil(s.T(), s.AIMClient.WithMethod(
 				http.MethodPut,
 			).WithRequest(
 				tt.requestBody,
-			).WithResponse(
 			).WithResponse(
 				&resp,
 			).DoRequest(
-				"/dashboards/%s", dashboard.ID,
+				"/dashboards/%s", tt.ID,
 			))
-			assert.Contains(s.T(), resp.Message, "cannot unmarshal")
+			assert.Contains(s.T(), resp.Message, tt.error)
 		})
 	}
 }

tests/integration/golang/aim/experiment/delete_test.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"database/sql"
 	"net/http"
-	"net/http"
 	"testing"
 	"time"
 
@@ -72,15 +71,6 @@ func (s *DeleteExperimentTestSuite) Test_Ok() {
 	length := len(experiments)
 
 	var resp response.DeleteExperiment
-	assert.Nil(
-		s.T(),
-		s.AIMClient.WithMethod(
-			http.MethodDelete,
-		).WithResponse(
-			&resp,
-		).DoRequest(
-			"/experiments/%d", *experiment.ID,
-		),
 	assert.Nil(
 		s.T(),
 		s.AIMClient.WithMethod(
@@ -139,7 +129,7 @@ func (s *DeleteExperimentTestSuite) Test_Error() {
 					"/experiments/%s", tt.ID,
 				),
 			)
-			assert.Contains(s.T(), resp.Error(), "Not Found")
+			assert.Contains(s.T(), resp.Error(), tt.error)
 			assert.NoError(s.T(), err)
 		})
 	}