diff --git a/pkg/api/apierror/unwrap_test.go b/pkg/api/apierror/unwrap_test.go
index 10a13bf6..45a9bafc 100644
--- a/pkg/api/apierror/unwrap_test.go
+++ b/pkg/api/apierror/unwrap_test.go
@@ -72,7 +72,7 @@ func TestUnwrap(t *testing.T) {
 		},
 		{
 			name: "Is able to parse a type that encapsulates another unknown type",
-			args: args{err: &deployments.DeleteDeploymentStatelessResourceRetryWith{
+			args: args{err: &deployments.DeleteDeploymentStatelessResourceBadRequest{
 				Payload: &models.BasicFailedReply{
 					Errors: []*models.BasicFailedReplyElement{
 						{
@@ -132,7 +132,7 @@ func TestUnwrap(t *testing.T) {
 		},
 		{
 			name: "Is able to parse a type that encapsulates a BasicFailedReply with fields",
-			args: args{err: &deployments.DeleteDeploymentStatelessResourceRetryWith{
+			args: args{err: &deployments.DeleteDeploymentStatelessResourceBadRequest{
 				Payload: &models.BasicFailedReply{
 					Errors: []*models.BasicFailedReplyElement{
 						{
diff --git a/pkg/api/platformapi/instanceconfigapi/create_test.go b/pkg/api/platformapi/instanceconfigapi/create_test.go
index 7269a8e1..8bf2609e 100644
--- a/pkg/api/platformapi/instanceconfigapi/create_test.go
+++ b/pkg/api/platformapi/instanceconfigapi/create_test.go
@@ -39,7 +39,7 @@ func TestCreate(t *testing.T) {
 	tests := []struct {
 		name string
 		args args
-		want *models.IDResponse
+		want *models.VersionedIDResponse
 		err  string
 	}{
 		{
@@ -77,7 +77,7 @@ func TestCreate(t *testing.T) {
 					},
 				},
 			}},
-			want: &models.IDResponse{ID: ec.String("an autogenerated id")},
+			want: &models.VersionedIDResponse{ID: ec.String("an autogenerated id")},
 		},
 		{
 			name: "Create Succeeds specifying an instance configuration ID",
@@ -115,7 +115,7 @@ func TestCreate(t *testing.T) {
 					},
 				}},
 			},
-			want: &models.IDResponse{ID: ec.String("kibana")},
+			want: &models.VersionedIDResponse{ID: ec.String("kibana")},
 		},
 		{
 			name: "Create fails on API error",
diff --git a/pkg/multierror/format_test.go b/pkg/multierror/format_test.go
index 88a01019..5b593286 100644
--- a/pkg/multierror/format_test.go
+++ b/pkg/multierror/format_test.go
@@ -134,7 +134,7 @@ func TestJSONFormatFunc(t *testing.T) {
 				errors.New("some"),
 				errors.New("some 2"),
 				errors.New("some 3"),
-				&deployments.DeleteDeploymentStatelessResourceRetryWith{
+				&deployments.DeleteDeploymentStatelessResourceBadRequest{
 					Payload: &models.BasicFailedReply{
 						Errors: []*models.BasicFailedReplyElement{
 							{