diff --git a/tests/cassandra_test.go b/tests/cassandra_test.go
index 155cccc5..595c4eb1 100644
--- a/tests/cassandra_test.go
+++ b/tests/cassandra_test.go
@@ -75,7 +75,7 @@ func TestCassandra(t *testing.T) {
 	assert.Equal(t, csAvn.Plan, cs.Spec.Plan)
 	assert.Equal(t, csAvn.CloudName, cs.Spec.CloudName)
 	assert.Equal(t, "450GiB", cs.Spec.DiskSpace)
-	assert.Equal(t, 460800, csAvn.DiskSpaceMb)
+	assert.Equal(t, float64(460800), *csAvn.DiskSpaceMb)
 	assert.Equal(t, map[string]string{"env": "test", "instance": "foo"}, cs.Spec.Tags)
 	csResp, err := avnClient.ServiceTags.Get(ctx, cfg.Project, name)
 	require.NoError(t, err)
diff --git a/tests/kafka_test.go b/tests/kafka_test.go
index c0437758..6e42cf10 100644
--- a/tests/kafka_test.go
+++ b/tests/kafka_test.go
@@ -76,7 +76,7 @@ func TestKafka(t *testing.T) {
 	assert.Equal(t, ksAvn.Plan, ks.Spec.Plan)
 	assert.Equal(t, ksAvn.CloudName, ks.Spec.CloudName)
 	assert.Equal(t, "600GiB", ks.Spec.DiskSpace)
-	assert.Equal(t, 614400, ksAvn.DiskSpaceMb)
+	assert.Equal(t, float64(614400), *ksAvn.DiskSpaceMb)
 	assert.Equal(t, map[string]string{"env": "test", "instance": "foo"}, ks.Spec.Tags)
 	ksResp, err := avnClient.ServiceTags.Get(ctx, cfg.Project, name)
 	require.NoError(t, err)
diff --git a/tests/kafka_with_projectvpc_ref_test.go b/tests/kafka_with_projectvpc_ref_test.go
index ce70aa31..e4dce1cd 100644
--- a/tests/kafka_with_projectvpc_ref_test.go
+++ b/tests/kafka_with_projectvpc_ref_test.go
@@ -85,7 +85,7 @@ func TestKafkaWithProjectVPCRef(t *testing.T) {
 	// Validates VPC
 	require.NotNil(t, kafka.Spec.ProjectVPCRef)
 	assert.Equal(t, vpcName, kafka.Spec.ProjectVPCRef.Name)
-	assert.Equal(t, anyPointer(vpc.Status.ID), kafkaAvn.ProjectVpcId)
+	assert.Equal(t, vpc.Status.ID, kafkaAvn.ProjectVpcId)
 
 	vpcAvn, err := avnClient.VPCs.Get(ctx, cfg.Project, vpc.Status.ID)
 	require.NoError(t, err)
diff --git a/tests/kafkschemaregistryacl_test.go b/tests/kafkschemaregistryacl_test.go
index c9517c42..9a931196 100644
--- a/tests/kafkschemaregistryacl_test.go
+++ b/tests/kafkschemaregistryacl_test.go
@@ -101,7 +101,7 @@ func TestKafkaSchemaRegistryACL(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, kafkaAvn.ServiceName, kafka.GetName())
 	assert.Equal(t, serviceRunningState, kafka.Status.State)
-	assert.Contains(t, serviceRunningStatesAiven, string(kafkaAvn.State))
+	assert.Contains(t, serviceRunningStatesAiven, kafkaAvn.State)
 	assert.Equal(t, kafkaAvn.Plan, kafka.Spec.Plan)
 	assert.Equal(t, kafkaAvn.CloudName, kafka.Spec.CloudName)
 
diff --git a/tests/mysql_test.go b/tests/mysql_test.go
index 9c0fe54a..fc105c21 100644
--- a/tests/mysql_test.go
+++ b/tests/mysql_test.go
@@ -74,7 +74,7 @@ func TestMySQL(t *testing.T) {
 	assert.Equal(t, msAvn.Plan, ms.Spec.Plan)
 	assert.Equal(t, msAvn.CloudName, ms.Spec.CloudName)
 	assert.Equal(t, "100GiB", ms.Spec.DiskSpace)
-	assert.Equal(t, 102400, msAvn.DiskSpaceMb)
+	assert.Equal(t, float64(102400), *msAvn.DiskSpaceMb)
 	assert.Equal(t, map[string]string{"env": "test", "instance": "foo"}, ms.Spec.Tags)
 	msResp, err := avnClient.ServiceTags.Get(ctx, cfg.Project, name)
 	require.NoError(t, err)
diff --git a/tests/opensearch_test.go b/tests/opensearch_test.go
index 6c25424b..4c499538 100644
--- a/tests/opensearch_test.go
+++ b/tests/opensearch_test.go
@@ -79,7 +79,7 @@ func TestOpenSearch(t *testing.T) {
 	assert.Equal(t, osAvn.Plan, os.Spec.Plan)
 	assert.Equal(t, osAvn.CloudName, os.Spec.CloudName)
 	assert.Equal(t, "240GiB", os.Spec.DiskSpace)
-	assert.Equal(t, 245760, osAvn.DiskSpaceMb)
+	assert.Equal(t, float64(245760), *osAvn.DiskSpaceMb)
 	assert.Equal(t, map[string]string{"env": "test", "instance": "foo"}, os.Spec.Tags)
 	osResp, err := avnClient.ServiceTags.Get(ctx, cfg.Project, name)
 	require.NoError(t, err)
diff --git a/tests/projectvpc_test.go b/tests/projectvpc_test.go
index 82113dec..7aa5872d 100644
--- a/tests/projectvpc_test.go
+++ b/tests/projectvpc_test.go
@@ -136,7 +136,7 @@ func TestProjectVPCID(t *testing.T) {
 
 	// Validates VPC
 	assert.Equal(t, vpc1.Status.ID, kafka.Spec.ProjectVPCID)
-	assert.Equal(t, anyPointer(vpc1.Status.ID), kafkaAvn.ProjectVpcId)
+	assert.Equal(t, vpc1.Status.ID, kafkaAvn.ProjectVpcId)
 
 	// Migrates the service to vpc2
 	kafkaYamlUpd := getKafkaForProjectVPCYaml(cfg.Project, vpc2.Status.ID, kafkaName, cfg.TertiaryCloudName)
diff --git a/tests/serviceintegration_test.go b/tests/serviceintegration_test.go
index 9cb20cdd..f246cf62 100644
--- a/tests/serviceintegration_test.go
+++ b/tests/serviceintegration_test.go
@@ -59,7 +59,7 @@ func TestServiceIntegrationClickhousePostgreSQL(t *testing.T) {
 	assert.Contains(t, serviceRunningStatesAiven, chAvn.State)
 	assert.Equal(t, chAvn.Plan, ch.Spec.Plan)
 	assert.Equal(t, chAvn.CloudName, ch.Spec.CloudName)
-	assert.Equal(t, chAvn.Maintenance.Dow, ch.Spec.MaintenanceWindowDow)
+	assert.Equal(t, string(chAvn.Maintenance.Dow), ch.Spec.MaintenanceWindowDow)
 	assert.Equal(t, chAvn.Maintenance.Time, ch.Spec.MaintenanceWindowTime)
 
 	// Validates PostgreSQL
@@ -69,7 +69,7 @@ func TestServiceIntegrationClickhousePostgreSQL(t *testing.T) {
 	assert.Contains(t, serviceRunningStatesAiven, pgAvn.State)
 	assert.Equal(t, pgAvn.Plan, pg.Spec.Plan)
 	assert.Equal(t, pgAvn.CloudName, pg.Spec.CloudName)
-	assert.Equal(t, pgAvn.Maintenance.Dow, pg.Spec.MaintenanceWindowDow)
+	assert.Equal(t, string(pgAvn.Maintenance.Dow), pg.Spec.MaintenanceWindowDow)
 	assert.Equal(t, pgAvn.Maintenance.Time, pg.Spec.MaintenanceWindowTime)
 
 	// Validates ServiceIntegration